c66 0.1.0 → 0.1.96

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDE0NGMzODMwZTIxZmJlZGNlNjljNDUyOGQxOWIzYmY1Y2Y5MjU1NA==
+  data.tar.gz: !binary |-
+    MzU2MDE3OWI5YzJmM2M1MTcxZTVhMTc2MDM0OGYzMzAyODJlZmE2Mw==
+SHA512:
+  metadata.gz: !binary |-
+    ZDFhMTM3YThjMGJiMzYxYzdlMThhOWQ1YzBhZTNkOTFlOTkxMDk3ODIxNGFi
+    MmQzYTdjN2Q5MzgyZTFjY2ZhYWI1YzY3MDQ4M2FkYjU3ZDA0MmEzMDMxNWYx
+    ZDY5MjM2MjU1YjMyNzZjMGFmMzEzMWMxYjdhNGJiMDM5NmY0MTc=
+  data.tar.gz: !binary |-
+    ZmI3YWFiMjFjZGM3NjllOWE1ZDRiNTc4NzA5MThiOGUxMWZiNWVhMWJhZGIy
+    ZmNjYWRkNDhlNDdmMDhjYjlhNTcxMzg5ODUzMzY4NzYzZTFhYTcxZGNhNjli
+    MDc5ZTdkMzc1MTUxNzVmNTQwNmYxNmU2ZWY3NmY2MDhhNDg1NmY=

data/.gitignore

@@ -2,12 +2,8 @@
 *.rbc
 .bundle
 .config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
 coverage
-doc/
+InstalledFiles
 lib/bundler/man
 pkg
 rdoc
@@ -15,3 +11,16 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.cloud66
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+
+.ruby-gemset
+.ruby-version
+/dev.sh
+/.DS_Store
+
+/source.sh

data/Gemfile.lock

@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    c66 (0.1.94)
+      bundler (~> 1.3)
+      httparty (~> 0.11.0)
+      json (~> 1.7.7)
+      oauth2 (~> 0.9.2)
+      rake (~> 10.1.0)
+      thor (~> 0.18.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    httparty (0.11.0)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
+    httpauth (0.2.0)
+    json (1.7.7)
+    jwt (0.1.10)
+      multi_json (>= 1.5)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.1)
+    thor (0.18.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  c66!

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Cloud66 Limited.
+Copyright (c) 2013 - 2014 Cloud66 Limited.
 
 MIT License
 

data/README.md

@@ -1,111 +1,200 @@
-# 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/):
+<p>
+<kbd>$ gem install c66</kbd>
+</p>
 
-    $ gem install c66
-
-## Usage
+## Help
 
-### 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
+## 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
+## List the Stacks
 
 You can list all your stacks using:
 
-	$ c66 list
+<p>
+<kbd>$ c66 list</kbd>
+</p>
 
-### Deploy a Stack
+## 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 a default stack UID:
+
+<p>
+<kbd>$ c66 save --stack &lt;stack_UID&gt;</kbd>
+</p>
+	
+or
 
-	$ c66 deploy
+<p>
+<kbd>$ c66 save -s &lt;stack_UID&gt;</kbd>
+</p>
 
+**Note:** The stack is saved in your current folder (.cloud66/stack.json) and only one default 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
+You can save multiple stack UID by giving an alias to a specific stack:
 
-It is possible to retrieve the settings of a specified stack and to easily modify them:
+<p>
+<kbd>$ c66 save --stack &lt;stack_UID&gt; --alias &lt;stack_alias&gt;</kbd>
+</p>
 
-To display the settings:
+Then you can use commands and specific a stack's alias, like so:
 
-	$ c66 settings --stack <stack_UID>
+<p>
+<kbd>$ c66 deploy -s &lt;stack_alias&gt;</kbd>
+</p>
 
-or
+## Settings of a Stack
+
+It is possible to retrieve the settings of a specified stack and to easily modify them:
 
-	$ c66 settings -s <stack_UID>
+To display the settings:
 
-If your stack UID is saved:
+<p>
+<kbd>$ c66 settings --stack &lt;stack_UID&gt;</kbd>
+</p>
+	
+or
 
-	$ c66 settings
+<p>
+<kbd>$ c66 settings -s &lt;stack_UID&gt;</kbd>
+</p>
+	
+If a default stack UID is saved:
 
+<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
+
+<p>
+<kbd>$ c66 set -s &lt;stack_UID&gt; -n &lt;setting_name&gt; -v &lt;value&gt;</kbd>
+</p>
+	
+If a default stack UID is saved:
 
+<p>
+<kbd>$ c66 set --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 -n &lt;setting_name&gt; -v &lt;value&gt;</kbd>
+</p>
 
-If the stack UID is saved:
+## Lease an IP address (version &ge; 0.1.91
 
-	$ c66 set --setting_name <setting_name> --value <value>
+You can allow an IP address to connect temporarily to the specific stack through ssh (22):
 
-or 
+<p>
+<kbd>$ c66 lease --stack &lt;stack_UID&gt; --ip-address &lt;ip_address&gt; --time-to-open &lt;time_to_open&gt;</kbd>
+</p>
 
-	$ c66 set -n <setting_name> -v <value>
+or
 
+<p>
+<kbd>$ c66 lease -s &lt;stack_UID&gt; -i &lt;ip_address&gt; -t &lt;time_to_open&gt;</kbd>
+</p>
 
-## Contributing
+Options *ip-address* and *time-to-open* are optional.
+By default:
 
-1. Fork it
+- *ip-address* : your IP address
+- *time-to-open* : 20 minutes
+
+To allow your own IP address to connect temporarily to the specific stack:
 
-2. Create your feature branch (`git checkout -b my-new-feature`)
+<p>
+<kbd>$ c66 lease --stack &lt;stack_UID&gt;</kbd>
+</p>
 
-3. Commit your changes (`git commit -am 'Add some feature'`)
+If a default stack UID is saved:
 
-4. Push to the branch (`git push origin my-new-feature`)
+<p>
+<kbd>$ c66 lease</kbd>
+</p>
 
-5. Create new Pull Request
+## Information of your toolbelt settings
 
-## Copyright
+At any time, you can see your toolbelt settings, it includes the version of the toolbelt but also some information about your saved stacks:
+ 
+<p>
+<kbd>$ c66 info</kbd>
+</p>
 
-Copyright (c) 2013 Cloud66 Limited.. See LICENSE for details.
+## 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`
+5. Create new Pull Request

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
@@ -18,6 +19,8 @@ module C66
         STK_DEPLOYING    = 6
         STK_TERMINAL_FAILURE    = 7
 
+        FORBIDDEN_STACKS_ALIAS = ['params', 'toolbelt']
+
         STATUS = {
             STK_QUEUED => 'Pending analysis',
             STK_SUCCESS => 'Deployed successfully',
@@ -30,16 +33,18 @@ module C66
         }
 
         VERSION_FILE = 'http://cdn.cloud66.com/config/cloud66_toolbelt.json'
-        BASE_URL = 'https://www.cloud66.com'
+        BASE_URL = ENV['C66_API_ENDPOINT'] || 'https://www.cloud66.com'
+				CLIENT_ID = ENV['C66_CLIENT_ID'] || '638412995ee3da6f67e24564ac297f9554ee253a8fe1502348c4d6e845bd9d0d'
+				CLIENT_SECRET = ENV['C66_CLIENT_SECRET'] || '961398353aa6e7f0f36dfcd83e447d748c54481b7a3b143e0119441516e8b91f'
 
         class C66Toolbelt < Thor
             no_commands {
                 def values
                     @values ||=
                     { :base_url => "#{BASE_URL}/api/2",
-                    :client_id => "638412995ee3da6f67e24564ac297f9554ee253a8fe1502348c4d6e845bd9d0d",
-                    :client_secret => "961398353aa6e7f0f36dfcd83e447d748c54481b7a3b143e0119441516e8b91f",
-                    :scope => "public redeploy",
+                    :client_id => CLIENT_ID,
+                    :client_secret => CLIENT_SECRET,
+                    :scope => "public redeploy admin users jobs",
                     :redirect_url => "urn:ietf:wg:oauth:2.0:oob",
                     :auth_url => "#{BASE_URL}/oauth/authorize",
                     :token_url => "#{BASE_URL}/oauth/token"
@@ -47,6 +52,7 @@ module C66
                 end
 
                 def base_url
+                    load_params
                     values[:base_url]
                 end
 
@@ -74,8 +80,16 @@ module C66
                     File.join(c66_path, "params.json")
                 end
 
-                def stack_file
-                    File.join(stack_path, "stack.json")
+                def stack_file(alias_name = nil)
+                    if alias_name
+                        if alias_name.match(/\w/)
+                            File.join(stack_path, "#{alias_name}.json")
+                        else
+                            abort "#{alias_name} is an invalid alias."
+                        end
+                    else
+                        File.join(stack_path, "stack.json")
+                    end
                 end
 
                 def load_config
@@ -88,7 +102,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,28 +110,27 @@ 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)
+                def load_stack(alias_name)
+                    if File.exists?(stack_file(alias_name))
+                        if file = JSON.load(IO.read(stack_file(alias_name)))
+                            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
                     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
+                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 abort_no_server
+                  abort "Cannot find the given server name in the stack."
                 end
 
                 def load_params
@@ -130,25 +143,40 @@ module C66
                         if @params.has_key? 'base_url'
                             values[:base_url] = @params['base_url']
                         else
-                            abort "Missing 'base_url' parameter in #{params_file}"                
+                            abort "Missing 'base_url' parameter in #{params_file}"
                         end
                         if @params.has_key? 'client_id'
                             values[:client_id] =  @params['client_id']
                         else
-                            abort "Missing 'client_id' parameter in #{params_file}"    
+                            abort "Missing 'client_id' parameter in #{params_file}"
                         end
                         if @params.has_key? 'client_secret'
                             values[:client_secret] = @params['client_secret']
                         else
-                            abort "Missing 'client_secret' parameter in #{params_file}"                          
+                            abort "Missing 'client_secret' parameter in #{params_file}"
                         end
-                        say "Parameters loaded."
+                        #say "Parameters loaded."
                     end
                 end
 
-                def get_stack(stack)
-                    save_stack(stack) if stack
-                    load_stack if stack.nil?
+                def get_stack(stack_id_or_alias_name)
+                    if stack_id_or_alias_name && !File.exist?(stack_file(stack_id_or_alias_name))
+                        @stack=stack_id_or_alias_name
+                    else
+                        load_stack(stack_id_or_alias_name)
+                    end
+                end
+                
+                def get_server_by_name(stack_id_or_alias_name, server_name)
+                  get_stack(stack_id_or_alias_name)
+                  
+                  # get stack servers
+                  response = token.get("#{base_url}/stacks/#{@stack}/servers.json")
+                  servers = parse_response(response)['response']
+                  server = servers.select { |s| s['name'].downcase == server_name.downcase }
+
+                  return nil if server.empty?
+                  return server.first
                 end
 
                 def client
@@ -173,33 +201,60 @@ module C66
                     end
                 end
 
-                def self.get_version
+                def error_message(error)
+                    begin
+                        if !error.response.parsed.nil?
+                            if (error.response.parsed.has_key? 'details')
+                                say error.response.parsed['details']
+                            else
+                                say error.response.parsed['error_description']
+                            end
+                        end
+                    rescue => e
+                        abort e.message
+                    end
+                end
+
+                def 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"
+                        say "Failed to retrieve the latest version of Cloud 66 Toolbelt, please contact us"
                     end
                 end
 
-                
-                def self.compare_versions
-                    result = C66::Utils::VERSION<=>get_version
+                def display_info
+                    say "#{CLIENT_FULLNAME} version #{C66::Utils::VERSION}\n\n"
+                end
+
+                def compare_versions
+                    result = C66::Utils::VERSION <=> Gem::Version.new(get_version)
                     case result
                     when 0..1
-            	        #say "Version is up-to-date."
-            	    when -1
-                       puts "There is a new version of Cloud66 Toolbelt. Pease run \"gem update #{CLIENT_NAME}\"."
+                        #say "Version is up-to-date."
+                    when -1
+                       say "There is a new version of Cloud66 Toolbelt. Pease run \"gem update #{CLIENT_NAME}\".",:red
                     end
-                end	   
+                end
+
+                def before_each_action
+                    compare_versions
+                    # pending_intercom_messages
+                end
             }
 
-            package_name "Cloud 66 Toolbelt"
-            desc "init", "Initialize the toolbelt"
-            map "d" => :deploy
+            package_name "#{CLIENT_FULLNAME}: version #{C66::Utils::VERSION}\n"
+
+            default_task :default
 
-            compare_versions
-            
+            desc "default", "hidden method", :hide => true
+            def default
+                before_each_action
+                help
+            end
 
+            desc "init", "Initialize the toolbelt"
+            map "d" => :deploy
             long_desc <<-LONGDESC
             Initialize Cloud 66 toolbelt
             LONGDESC
@@ -226,63 +281,265 @@ module C66
 
             desc "list", "Lists all the stacks"
             def list
-                response = parse_response(token.get("#{base_url}/stacks.json"))
+                before_each_action
+                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
 
             desc "settings", "Get the list of settings for this stack"
             option :stack, :aliases => "-s", :required => false
-            def settings()
+            def settings
+                before_each_action
                 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"
+                        say "#{setting['key'].ljust(20)}\t\t#{setting['value']}\t#{setting['readonly'] ? '(readonly)' : ''}\r\n"
                    end
                 rescue OAuth2::Error => e
-                    abort e.message
+                    error_message(e)
                 end
             end
 
+            desc "ssh", "Start a SSH shell terminal with the given server"
+            option :stack, :aliases => "-s", :required => false
+            option :server_name, :aliases => "-n", :required => true
+            def ssh
+              before_each_action
+              begin
+                get_stack(options[:stack])
+                abort_no_stack if @stack.nil?
+                server = get_server_by_name(options[:stack], options[:server_name])
+                abort_no_server if server.nil?
+                say "Found server #{server['uid']} with name #{options[:server_name]}"
+                
+                # get the SSH key
+                say "Requesting the SSH keys"
+                response = token.get("#{base_url}/servers/#{server['uid']}/ssh_private_key.json")
+                prv_key = parse_response(response)['response']['private_key']
+
+                say "Opening firewall temporarily for this IP address"
+                lease
+
+                path = File.join(Dir.home, '.ssh', "server_#{server['name'].downcase}")
+
+                # save it to user directory
+                File.open(path, 'w') do |file| 
+                  file.write(prv_key) 
+                  file.chmod(0600)
+                end
+
+                # let's do it
+                say "ssh '#{server['user_name']}'@'#{server['address']}' -i '#{path}'"
+                system "ssh '#{server['user_name']}'@'#{server['address']}' -i '#{path}'"
+              rescue OAuth2::Error => e
+                  error_message(e)
+              end
+            end
+              
             desc "set", "Set the value of a specific setting"
             option :stack, :aliases => "-s", :required => false
             option :setting_name, :aliases => "-n", :required => true
             option :value, :aliases => "-v", :required => true
             def set()
+                before_each_action
                 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
 
             desc "deploy", "Deploy the given stack"
             option :stack, :aliases => "-s", :required => false
-            def deploy()
+            def deploy
+                before_each_action
                 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 "restart", "Restart the given stack"
+			option :stack, :aliases => "-s", :required => false
+			option :target, :aliases => "-t", :required => false
+			def restart
+				before_each_action
+				begin
+					get_stack(options[:stack])
+					abort_no_stack if @stack.nil?
+
+					target_option = options[:target]
+					target = target_option.nil? ? 'web' : target_option.to_s
+					abort "Only 'web' target is currently supported" unless target == 'web'
+
+					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}/restart.json", {})
+					say JSON.parse(response.body)['response']['message']
+
+				rescue OAuth2::Error => e
+					error_message(e)
+				end
+			end
+
+			desc "save", "Save the given stack information in the current directory"
+            option :stack, :aliases => "-s", :required => true
+            option :alias, :aliases => "-a", :required => false
+            def save
+                before_each_action
+                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}
+                    if (!FORBIDDEN_STACKS_ALIAS.include? options[:alias])
+                        File.open(stack_file(options[:alias]),"w") do |f|
+                            f.write(@stack_json.to_json)
+                        end
+                    else
+                        abort 'Stack alias "'+options[:alias]+'" is forbidden, please retry with another alias.'
+                    end
+                    @stack = options[:stack]
+
+                    say "Linked stack #{stack_name} to #{stack_file(options[:alias])}.\n"
+                    if !options[:alias]
+                        say "You are now able to use other commands without specify the stack UID."
+                    else
+                        say "You are now able to use other commands and specific this stack's alias, like so: "\
+                        "`c66 deploy -s #{options[:alias]}`"
+                    end
+                rescue OAuth2::Error => e
+                    error_message(e)
+                end
+            end
+
+            desc "info", "#{CLIENT_FULLNAME} information"
+            def info
+                before_each_action
+                begin
+                    say "#{CLIENT_FULLNAME} version #{C66::Utils::VERSION}\n\n"
+                    Dir.glob("#{stack_path}/*.json") do |stack_file|
+                        stack_alias = File.basename(stack_file, ".json")
+                        if (!FORBIDDEN_STACKS_ALIAS.include? stack_alias)
+                            load_stack(stack_alias)
+                            if stack_alias == "stack"
+                                say "Default stack: no alias"
+                            else
+                                say "Alias: #{stack_alias}"
+                            end
+                            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']]}\n\n"
+                        end
+                    end
+                rescue OAuth2::Error => e  
+                    puts "Didn't find any valid stacks, please use the 'save' method."               
+                    error_message(e)
                 end
             end
+
+            desc "lease", "Allow an IP address to connect temporarily to the specified stack through the specified port - the default port is ssh (22)"
+            option :stack, :aliases => "-s", :required => false
+            option :ip_address, :aliases => "-i", :required => false
+            option :time_to_open, :aliases => "-t", :required => false, :default => 20
+			option :port, :aliases => "-p", :required => false, :default => 22
+            option :show_ip, :aliases => "-a", :required => false
+            def lease()
+                before_each_action
+                begin
+                    abort "time_to_open value is invalid. The value must be an integer between 0 and 240 (~4 hours)." unless (0..240).include?(options[:time_to_open].to_i)
+					port = options.fetch(:port) { 22 }
+					abort "port value is invalid. The value must be a valid port." unless port.to_i > 0
+                    get_stack(options[:stack])
+                    abort_no_stack if @stack.nil?
+                    response = token.post("#{base_url}/stacks/#{@stack}/lease.json", { :body => { :ip_address => options[:ip_address], :time_to_open => options[:time_to_open], :port => port }})
+                    say JSON.parse(response.body)['response']['message'] if JSON.parse(response.body)['response']['ok']
+
+                    if options[:show_ip]
+                        server_groups = token.get("#{base_url}/stacks/#{@stack}/server_groups.json")
+                        rails_server_group = JSON.parse(server_groups.body)['response'].find { |sg| sg['name'] == 'Rails Server' }
+                        servers = token.get("#{base_url}/stacks/#{@stack}/server_groups/#{rails_server_group['id']}/servers.json")
+                        server_ip_address = JSON.parse(servers.body)['response'][0]['address']
+                        say "For reference, here's the IP address for your first Rails server: #{server_ip_address}"
+                    end
+                rescue OAuth2::Error => e
+                    error_message(e)
+                end
+			end
+
+			desc "download_backup","Download a backup"
+			option :backup_id, :aliases => "-b", :required => true
+			def download_backup()
+				before_each_action
+				begin
+					next_extension = nil
+					downloaded_files = []
+					begin
+						response = parse_response(token.get("#{base_url}/backups/#{options[:backup_id]}/export/#{next_extension.nil? ? '' : next_extension }"))
+						file_name = response['response']['file_name']
+						unless file_name.nil?
+							File.open(file_name, "wb") do |f|
+								f.write HTTParty.get(response['response']['url']).parsed_response
+							end
+							downloaded_files << file_name
+						end
+						next_extension = response['response']['next_extension']
+					end while (!next_extension.nil?)
+
+					if downloaded_files.size > 0
+						if downloaded_files.size > 1
+							File.open("#{options[:backup_id]}.tar", "wb") do |output_f|
+								downloaded_files.sort.each {|f| output_f.write(File.open(f, 'r').read)}
+							end
+							downloaded_files.each {|f| File.delete f }
+						else
+							File.rename downloaded_files.first, "#{options[:backup_id]}.tar"
+						end
+						say "Your backup is downloaded : #{options[:backup_id]}.tar"
+					else
+						say "There is no file associated to #{options[:backup_id]}"
+					end
+				rescue OAuth2::Error => e
+					error_message(e)
+				end
+			end
         end
     end
 end

data/lib/c66/utils/version.rb

@@ -1,6 +1,7 @@
 module C66
 	module Utils
- 	 	VERSION = "0.1.0"
+		#Version format
+ 	 	VERSION = Gem::Version.new("0.1.96")
 	end
 end
 	

metadata

@@ -1,96 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: c66
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.96
 platform: ruby
 authors:
 - Cloud 66
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70093107966800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70093107966800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70093107966180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093107966180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70093107965480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
-  version_requirements: *70093107965480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70093107964520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70093107964520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70093107963280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
-  version_requirements: *70093107963280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70093107962820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093107962820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 description: See https://www.cloud66.com for more info
 email:
 - hello@cloud66.com
 executables:
-- c66.rb
+- c66
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/c66.rb
+- bin/c66
 - c66.gemspec
 - lib/c66.rb
 - lib/c66/commands/c66_toolbelt.rb
@@ -98,26 +116,25 @@ files:
 homepage: https://www.cloud66.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cloud 66 Toolbelt
 test_files: []