From a524bffaa27c127cd9efdba7772065cdac6bd72c Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <juanchiviotti@gmail.com>
Date: Thu, 19 Mar 2015 11:45:07 -0400
Subject: [PATCH] Integrate with SDK v1.0.0

---
 build/actions/keys.js          | 8 ++++----
 build/actions/preferences.js   | 9 ++++-----
 build/app.js                   | 4 ----
 lib/actions/keys.coffee        | 5 +++--
 lib/actions/preferences.coffee | 5 ++---
 lib/app.coffee                 | 4 ----
 package.json                   | 3 ++-
 7 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/build/actions/keys.js b/build/actions/keys.js
index 28ac390e..c96b3a60 100644
--- a/build/actions/keys.js
+++ b/build/actions/keys.js
@@ -1,5 +1,5 @@
 (function() {
-  var _, async, capitano, commandOptions, fs, resin, visuals;
+  var SSH_KEY_WIDTH, _, async, capitano, commandOptions, fs, resin, visuals;
 
   _ = require('lodash');
 
@@ -33,6 +33,8 @@
     }
   };
 
+  SSH_KEY_WIDTH = 43;
+
   exports.info = {
     signature: 'key <id>',
     description: 'list a single ssh key',
@@ -40,12 +42,10 @@
     permission: 'user',
     action: function(params, options, done) {
       return resin.models.key.get(params.id, function(error, key) {
-        var sshKeyWidth;
         if (error != null) {
           return done(error);
         }
-        sshKeyWidth = resin.settings.get('sshKeyWidth');
-        key.public_key = '\n' + visuals.helpers.chop(key.public_key, sshKeyWidth);
+        key.public_key = '\n' + visuals.helpers.chop(key.public_key, SSH_KEY_WIDTH);
         console.log(visuals.widgets.table.vertical(key, ['id', 'title', 'public_key']));
         return done();
       });
diff --git a/build/actions/preferences.js b/build/actions/preferences.js
index 8cc5279f..a5b3c61f 100644
--- a/build/actions/preferences.js
+++ b/build/actions/preferences.js
@@ -1,11 +1,11 @@
 (function() {
-  var open, resin, url;
+  var open, settings, url;
 
   open = require('open');
 
   url = require('url');
 
-  resin = require('resin-sdk');
+  settings = require('resin-settings-client');
 
   exports.preferences = {
     signature: 'preferences',
@@ -13,9 +13,8 @@
     help: 'Use this command to open the preferences form.\n\nIn the future, we will allow changing all preferences directly from the terminal.\nFor now, we open your default web browser and point it to the web based preferences form.\n\nExamples:\n\n	$ resin preferences',
     permission: 'user',
     action: function() {
-      var absUrl, preferencesUrl;
-      preferencesUrl = resin.settings.get('urls.preferences');
-      absUrl = url.resolve(resin.settings.get('remoteUrl'), preferencesUrl);
+      var absUrl;
+      absUrl = url.resolve(settings.get('remoteUrl'), '/preferences');
       return open(absUrl);
     }
   };
diff --git a/build/app.js b/build/app.js
index 37999461..6ba8b38b 100644
--- a/build/app.js
+++ b/build/app.js
@@ -152,10 +152,6 @@
       return update.check(callback);
     }, function(callback) {
       return plugins.register('resin-plugin-', callback);
-    }, function(callback) {
-      var dataPrefix;
-      dataPrefix = resin.settings.get('dataPrefix');
-      return resin.data.prefix.set(dataPrefix, callback);
     }, function(callback) {
       var cli;
       cli = capitano.parse(process.argv);
diff --git a/lib/actions/keys.coffee b/lib/actions/keys.coffee
index 12bdb09a..aac451b6 100644
--- a/lib/actions/keys.coffee
+++ b/lib/actions/keys.coffee
@@ -24,6 +24,8 @@ exports.list =
 			console.log visuals.widgets.table.horizontal keys, [ 'id', 'title' ]
 			return done()
 
+SSH_KEY_WIDTH = 43
+
 exports.info =
 	signature: 'key <id>'
 	description: 'list a single ssh key'
@@ -39,8 +41,7 @@ exports.info =
 		resin.models.key.get params.id, (error, key) ->
 			return done(error) if error?
 
-			sshKeyWidth = resin.settings.get('sshKeyWidth')
-			key.public_key = '\n' + visuals.helpers.chop(key.public_key, sshKeyWidth)
+			key.public_key = '\n' + visuals.helpers.chop(key.public_key, SSH_KEY_WIDTH)
 
 			console.log(visuals.widgets.table.vertical(key, [ 'id', 'title', 'public_key' ]))
 			return done()
diff --git a/lib/actions/preferences.coffee b/lib/actions/preferences.coffee
index 823d7e77..4fa191ed 100644
--- a/lib/actions/preferences.coffee
+++ b/lib/actions/preferences.coffee
@@ -1,6 +1,6 @@
 open = require('open')
 url = require('url')
-resin = require('resin-sdk')
+settings = require('resin-settings-client')
 
 exports.preferences =
 	signature: 'preferences'
@@ -17,6 +17,5 @@ exports.preferences =
 	'''
 	permission: 'user'
 	action: ->
-		preferencesUrl = resin.settings.get('urls.preferences')
-		absUrl = url.resolve(resin.settings.get('remoteUrl'), preferencesUrl)
+		absUrl = url.resolve(settings.get('remoteUrl'), '/preferences')
 		open(absUrl)
diff --git a/lib/app.coffee b/lib/app.coffee
index c6ce437a..2085d09d 100644
--- a/lib/app.coffee
+++ b/lib/app.coffee
@@ -125,10 +125,6 @@ async.waterfall([
 	(callback) ->
 		plugins.register('resin-plugin-', callback)
 
-	(callback) ->
-		dataPrefix = resin.settings.get('dataPrefix')
-		resin.data.prefix.set(dataPrefix, callback)
-
 	(callback) ->
 		cli = capitano.parse(process.argv)
 
diff --git a/package.json b/package.json
index 364ce4fc..eeb1589a 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,8 @@
     "open": "0.0.5",
     "progress-stream": "^0.5.0",
     "resin-cli-visuals": "^0.1.0",
-    "resin-sdk": "^0.0.4",
+    "resin-sdk": "^1.0.0",
+    "resin-settings-client": "^1.0.0",
     "resin-vcs": "^1.0.0",
     "underscore.string": "~2.4.0",
     "update-notifier": "^0.3.1"