c66 0.1.0 → 0.1.7

data/.gitignore

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

data/README.md

@@ -1,65 +1,99 @@
-# Cloud 66 Toolbelt: c66
-
-Cloud 66 Toolbelt is a simple command-line tool for the awesome Cloud 66 customers. It allows you to deploy, modify settings and retrieve the current status of your Cloud 66 stacks, and much more!
+<h1 class="doc-title">Cloud 66 Toolbelt</h1>
+<p class="lead">Cloud 66 Toolbelt is a simple command-line tool for the awesome Cloud 66 customers. It allows you to deploy, modify settings and retrieve the current status of your Cloud 66 stacks, and much more!</p>
 
 ## Installation
 
 You can install the Cloud 66 Toolbelt using [RubyGems](http://rubygems.org/):
-
-    $ gem install c66
+<p>
+<kbd>$ gem install c66</kbd>
+</p>
 
 ## Usage
 
 ### Help
+
 With c66 installed, you can display the help with one of the following instructions:
+<p>
+<kbd>$ c66 help</kbd>
+</p>
+	
+or
 
-	$ c66 help
+<p>
+<kbd>$ c66</kbd>
+</p>
 
-or
+or for a specific command:
 
-	$ c66
+<p>
+<kbd>$ c66 help &lt;command&gt;</kbd>
+</p>
 
 ### Initialize the Toolbelt
 
 Firstly, to use the Toolbelt, you will need to initiate it using:
 
-	$ c66 init
-
+<p>
+<kbd>$ c66 init</kbd>
+</p>
+	
 Then visit the URL given once authorized, copy and paste the `authorization code` into the command-line interface.
-
 You need to sign in and allow the Cloud 66 Toolbelt application to use your account to access to the authorization code.
 
-Note: This is a one-off task.
+**Note**: This is a one-off task.
 
 ### List the Stacks
 
 You can list all your stacks using:
 
-	$ c66 list
+<p>
+<kbd>$ c66 list</kbd>
+</p>
 
 ### Deploy a Stack
 
 Deploy a stack using the command `deploy` with a stack UID (Unique Identifer):
 
-	$ c66 deploy --stack <stack_UID>
-
+<p>
+<kbd>$ c66 deploy --stack &lt;stack_UID&gt;</kbd>
+</p>
+	
 or
 
-	$ c66 deploy -s <stack_UID>
-
+<p>
+<kbd>$ c66 deploy -s &lt;stack_UID&gt;</kbd>
+</p>
+	
 You can retrieve the UID of a stack using the `list` command.
-
 Through the Cloud 66 interface, click on your stack, then click on the cog and select the stack information view to retrieve the UID:
-
 ![stack_uid](http://cdn.cloud66.com.s3.amazonaws.com/images/Toolbelt/exemple_stack_uid.PNG)
 
-The stack UID is saved when you deploy through the Cloud 66 Toolbelt. It allows you to deploy a stack without putting the stack UID every time:
+There is a command to save your stack UID:
+
+<p>
+<kbd>$ c66 save --stack &lt;stack_UID&gt;</kbd>
+</p>
+	
+or
+
+<p>
+<kbd>$ c66 save -s &lt;stack_UID&gt;</kbd>
+</p>
 
-	$ c66 deploy
+**Note:** The stack is saved in your current folder (.cloud66/stack.json) and only one stack will be saved per folder.
 
+When your stack UID is saved, you are able to use other commands without specify the stack UID.
+For instance, it allows you to deploy a stack without putting the stack UID every time:
+
+<p>
+<kbd>$ c66 deploy</kbd>
+</p>
+	
 you can use a short-cut for this command:
 
-	$ c66 d
+<p>
+<kbd>$ c66 d</kbd>
+</p>
 
 ### Settings of a Stack
 
@@ -67,45 +101,58 @@ It is possible to retrieve the settings of a specified stack and to easily modif
 
 To display the settings:
 
-	$ c66 settings --stack <stack_UID>
-
+<p>
+<kbd>$ c66 settings --stack &lt;stack_UID&gt;</kbd>
+</p>
+	
 or
 
-	$ c66 settings -s <stack_UID>
-
+<p>
+<kbd>$ c66 settings -s &lt;stack_UID&gt;</kbd>
+</p>
+	
 If your stack UID is saved:
 
-	$ c66 settings
-
+<p>
+<kbd>$ c66 settings</kbd>
+</p>
+	
 To modify a setting:
 
-	$ c66 set --stack <stack_UID> --setting_name <setting_name> --value <value>
-
+<p>
+<kbd>$ c66 set --stack &lt;stack_UID&gt; --setting_name &lt;setting_name&gt; --value &lt;value&gt;</kbd>
+</p>
+	
 or
 
-	$ c66 set -s <stack_UID> -n <setting_name> -v <value>
-
+<p>
+<kbd>$ c66 set -s &lt;stack_UID&gt; -n &lt;setting_name&gt; -v &lt;value&gt;</kbd>
+</p>
+	
 If the stack UID is saved:
 
-	$ c66 set --setting_name <setting_name> --value <value>
+<p>
+<kbd>$ c66 set --setting_name &lt;setting_name&gt; --value &lt;value&gt;</kbd>
+</p>
+	
+or
 
-or 
+<p>
+<kbd>$ c66 set -n &lt;setting_name&gt; -v &lt;value&gt;</kbd>
+</p>
 
-	$ c66 set -n <setting_name> -v <value>
+### Information of your toolbelt settings
 
+At any time, you can see your toolbelt settings, it includes the version of the toolbelt but also some information about your saved stack:
+ 
+<p>
+<kbd>$ c66 info</kbd>
+</p>
 
 ## Contributing
 
 1. Fork it
-
-2. Create your feature branch (`git checkout -b my-new-feature`)
-
-3. Commit your changes (`git commit -am 'Add some feature'`)
-
-4. Push to the branch (`git push origin my-new-feature`)
-
+2. Create your feature branch `git checkout -b my-new-feature`
+3. Commit your changes `git commit -am 'Add some feature'`
+4. Push to the branch `git push origin my-new-feature`
 5. Create new Pull Request
-
-## Copyright
-
-Copyright (c) 2013 Cloud66 Limited.. See LICENSE for details.

data/lib/c66/commands/c66_toolbelt.rb

@@ -8,6 +8,7 @@ module C66
     module Commands
 
         CLIENT_NAME = 'c66'
+        CLIENT_FULLNAME = 'Cloud 66 Toolbelt'
 
         STK_QUEUED    = 0
         STK_SUCCESS    = 1
@@ -88,7 +89,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 +97,25 @@ 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}"
+                        if file = JSON.load(IO.read(stack_file))
+                            if file.has_key? 'stack_id' 
+                                @stack = file['stack_id']
+                            end
+                            if file.has_key? 'stack_name' and !@stack.nil?
+                                @stack_name = file['stack_name']
+                                say "Stack #{@stack_name} loaded."
+                            end
                         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 +143,7 @@ module C66
                 end
 
                 def get_stack(stack)
-                    save_stack(stack) if stack
+                    @stack=stack
                     load_stack if stack.nil?
                 end
 
@@ -173,11 +169,26 @@ module C66
                     end
                 end
 
+                def error_message(error)
+                    begin
+                        if (!error.response.parsed.nil?)
+                            then
+                            if (error.response.parsed.has_key? 'details')
+                                puts error.response.parsed['details']
+                            else                   
+                                puts error.response.parsed['error_description']
+                            end
+                        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"
+                        puts "Failed to retrieve the latest version of #{CLIENT_FULLNAME}, please contact us"
                     end
                 end
 
@@ -190,19 +201,17 @@ 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"
+            compare_versions
+
+            package_name "#{CLIENT_FULLNAME}: version #{C66::Utils::VERSION}\n"
             desc "init", "Initialize the toolbelt"
             map "d" => :deploy
 
-            compare_versions
             
 
-            long_desc <<-LONGDESC
-            Initialize Cloud 66 toolbelt
-            LONGDESC
             def init
                 load_params
                 result = client.auth_code.authorize_url(:redirect_uri => values[:redirect_url], :scope => values[:scope])
@@ -226,14 +235,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,17 +255,20 @@ 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']
+                    number_settings = JSON.parse(response.body)['count']
+                    stack_details = parse_response(token.get("#{base_url}/stacks/#{@stack}.json"))
+                    stack_name = stack_details['response']['name']
 
                     abort "No settings found" if settings.nil?
-
+                    say "Getting "+stack_name+" settings:"
                     settings.each do |setting|
                         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 +279,13 @@ 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?
+                    stack_details = parse_response(token.get("#{base_url}/stacks/#{@stack}.json"))
+                    stack_name = stack_details['response']['name']
                     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 "On #{stack_name}: applied value '#{options[:value]}' to setting '#{options[:setting_name]}'" if JSON.parse(response.body)['response']['ok']
                 rescue OAuth2::Error => e
-                    abort e.message
+                    error_message(e)
                 end
             end
 
@@ -276,11 +294,51 @@ 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?
+                   stack_details = parse_response(token.get("#{base_url}/stacks/#{@stack}.json"))
+                   stack_name = stack_details['response']['name']
+                   say stack_name+": "
                    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()
+                begin
+                    stack_details = parse_response(token.get("#{base_url}/stacks/#{options[:stack]}.json"))
+                    stack_name = stack_details['response']['name']
+                    if !File.directory?(stack_path)
+                        Dir.mkdir(stack_path)
+                    end
+                    @stack_json = { :stack_id => options[:stack], :stack_name => stack_name}
+                    File.open(stack_file,"w") do |f|
+                        f.write(@stack_json.to_json)
+                    end
+                    @stack = options[:stack]
+                    say "Linked stack #{stack_name} to #{stack_file}. "\
+                        "You are now able to use other commands without specify the stack UID."
+                rescue OAuth2::Error => e
+                    error_message(e)
+                end
+            end
+
+            desc "info", "#{CLIENT_FULLNAME} information"
+            def info()
+                begin
+                    say "#{CLIENT_FULLNAME} version #{C66::Utils::VERSION}\n\n"
+                    load_stack
+                    stack_details = parse_response(token.get("#{base_url}/stacks/#{@stack}.json"))
+                    say "name: "+stack_details['response']['name']
+                    say "UID: "+stack_details['response']['uid']
+                    say "Environment: "+stack_details['response']['environment']
+                    say "Status: "+STATUS[stack_details['response']['status']]
+                rescue OAuth2::Error => e  
+                    puts "Didn't find any valid stack, please use the 'save' method."               
+                    error_message(e)
                 end
             end
         end

data/lib/c66/utils/version.rb

@@ -1,6 +1,6 @@
 module C66
 	module Utils
- 	 	VERSION = "0.1.0"
+ 	 	VERSION = "0.1.7"
 	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: 21
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 7
+  version: 0.1.7
 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-22 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: []
+