c66 0.1.0 → 0.1.6

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.cloud66
 .yardoc
 Gemfile.lock
 InstalledFiles

data/lib/c66/commands/c66_toolbelt.rb

@@ -88,7 +88,7 @@ module C66
 
                 def save_config
                     if !File.directory?(c66_path)
-                        Dir.mkdir_p(c66_path)
+                        Dir.mkdir(c66_path)
                     end
 
                     File.open(config_file,"w") do |f|
@@ -96,30 +96,19 @@ module C66
                     end
                 end
 
-                def save_stack(stack_id)
-                    if !File.directory?(stack_path)
-                        Dir.mkdir(stack_path)
-                    end
-                    @stack_json = { :stack_id => stack_id}
-                    File.open(stack_file,"w") do |f|
-                        f.write(@stack_json.to_json)
-                    end
-                    @stack = stack_id
-                    say "Stack #{stack_id} saved to #{stack_file}"
-                end
-
                 def load_stack
                     if File.exists?(stack_file)
                         if @stack = JSON.load(IO.read(stack_file))['stack_id']
                             say "Stack #{@stack} loaded."
-                        else
-                            abort "No stack id found at #{stack_file}"
                         end
-                    else
-                        say("No stack saved at #{stack_file}.")
                     end
                 end
 
+                def abort_no_stack
+                    abort "No stack provided or saved, please use '--stack' or '-s' option. "\
+                    "You can also use the 'save' method with '--stack' or '-s' option."
+                end
+
                 def load_params
                     if File.exists?(params_file) && File.size(params_file)!=0
                         begin
@@ -147,7 +136,7 @@ module C66
                 end
 
                 def get_stack(stack)
-                    save_stack(stack) if stack
+                    @stack=stack
                     load_stack if stack.nil?
                 end
 
@@ -173,9 +162,21 @@ module C66
                     end
                 end
 
+                def error_message(error)
+                    begin
+                        if (error.response.parsed.has_key? 'details')
+                            puts error.response.parsed['details']
+                        else                   
+                            puts error.response.parsed['error_description']
+                        end
+                    rescue => e
+                        abort e.message
+                    end
+                end
+
                 def self.get_version
                     begin
-                        JSON.load(HTTParty.get(VERSION_FILE)).fetch("version")
+                        JSON.load(HTTParty.get(VERSION_FILE).response.body).fetch("version")
                     rescue => e
                         puts "Failed to retrieve the latest version of Cloud 66 Toolbelt, please contact us"
                     end
@@ -190,7 +191,7 @@ module C66
             	    when -1
                        puts "There is a new version of Cloud66 Toolbelt. Pease run \"gem update #{CLIENT_NAME}\"."
                     end
-                end	   
+                end
             }
 
             package_name "Cloud 66 Toolbelt"
@@ -226,14 +227,18 @@ module C66
 
             desc "list", "Lists all the stacks"
             def list
-                response = parse_response(token.get("#{base_url}/stacks.json"))
+                begin
+                    response = parse_response(token.get("#{base_url}/stacks.json"))
 
-                if response['count'] != 0
-                    response['response'].each do |stack|
-                        say "#{stack['name']} (#{stack['uid']}) : #{stack['environment']} - #{STATUS[stack['status']]}"
+                    if response['count'] != 0
+                        response['response'].each do |stack|
+                            say "#{stack['name']} (#{stack['uid']}) : #{stack['environment']} - #{STATUS[stack['status']]}"
+                        end
+                    else
+                        say "No stacks found"
                     end
-                else
-                    say "No stacks found"
+                rescue OAuth2::Error => e
+                    error_message(e)
                 end
             end
 
@@ -242,7 +247,7 @@ module C66
             def settings()
                 begin
                     get_stack(options[:stack])
-                    abort "No stack provided or saved, please use '--stack' or '-s' option" if @stack.nil?
+                    abort_no_stack if @stack.nil?
                     response = token.get("#{base_url}/stacks/#{@stack}/settings.json")
                     settings = JSON.parse(response.body)['response']
 
@@ -252,7 +257,7 @@ module C66
                         say "#{setting['key']}\t\t#{setting['value']}\t#{setting['readonly'] ? '(readonly)' : ''}\r\n"
                    end
                 rescue OAuth2::Error => e
-                    abort e.message
+                    error_message(e)
                 end
             end
 
@@ -263,11 +268,11 @@ module C66
             def set()
                 begin
                     get_stack(options[:stack])
-                    abort "No stack provided or saved, please use '--stack' or '-s' option" if @stack.nil?
+                    abort_no_stack if @stack.nil?
                     response = token.post("#{base_url}/stacks/#{@stack}/setting.json", { :body => { :setting_name => options[:setting_name], :setting_value => options[:value] }})
-                    say "Setting applied" if JSON.parse(response.body)['response']['ok']
+                    say "Setting applied: '#{options[:value]}' to '#{options[:setting_name]}'" if JSON.parse(response.body)['response']['ok']
                 rescue OAuth2::Error => e
-                    abort e.message
+                    error_message(e)
                 end
             end
 
@@ -276,12 +281,27 @@ module C66
             def deploy()
                 begin
                    get_stack(options[:stack])
-                   abort "No stack provided or saved, please use '--stack' or '-s' option" if @stack.nil?
+                   abort_no_stack if @stack.nil?
                    response = token.post("#{base_url}/stacks/#{@stack}/redeploy.json", {})
                    say JSON.parse(response.body)['response']['message']
                 rescue OAuth2::Error => e
-                    abort "Could't find your stack, maybe it was moved, deleted or you accidentally mistyped the stack ID"
+                    error_message(e)                    
+                end
+            end
+
+            desc "save", "Save the given stack to simplify following commands"
+            option :stack, :aliases => "-s", :required => true
+            def save()
+                if !File.directory?(stack_path)
+                    Dir.mkdir(stack_path)
+                end
+                @stack_json = { :stack_id => options[:stack]}
+                File.open(stack_file,"w") do |f|
+                    f.write(@stack_json.to_json)
                 end
+                @stack = options[:stack]
+                say "Linked stack #{options[:stack]} to #{stack_file}. "\
+                    "You are now able to use other commands without specify the stack UID."
             end
         end
     end

data/lib/c66/utils/version.rb

@@ -1,6 +1,6 @@
 module C66
 	module Utils
- 	 	VERSION = "0.1.0"
+ 	 	VERSION = "0.1.6"
 	end
 end
 	

metadata

@@ -1,123 +1,169 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: c66
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 6
+  version: 0.1.6
 platform: ruby
-authors:
+authors: 
 - Cloud 66
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70093107966800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *70093107966800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70093107966180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 75
+        segments: 
+        - 10
+        - 1
+        - 0
         version: 10.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70093107966180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &70093107965480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 85
+        segments: 
+        - 0
+        - 18
+        - 1
         version: 0.18.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70093107965480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: oauth2
-  requirement: &70093107964520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :runtime
-  prerelease: false
-  version_requirements: *70093107964520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70093107963280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 7
+        - 7
         version: 1.7.7
   type: :runtime
-  prerelease: false
-  version_requirements: *70093107963280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: httparty
-  requirement: &70093107962820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
         version: 0.11.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70093107962820
+  version_requirements: *id006
 description: See https://www.cloud66.com for more info
-email:
+email: 
 - hello@cloud66.com
-executables:
-- c66.rb
+executables: 
+- c66
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/c66.rb
+- bin/c66
 - c66.gemspec
 - lib/c66.rb
 - lib/c66/commands/c66_toolbelt.rb
 - lib/c66/utils/version.rb
 homepage: https://www.cloud66.com
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Cloud 66 Toolbelt
 test_files: []
+