forj in forj-0.0.29

- old
+ new

@@ -30,45 +30,59 @@
 
 
 class Forj < Thor
   desc 'help', 'Display forj cli help'
   def help
-    puts 'forj cli commands'
-    puts '    -action:'
-    puts '        boot: boot a Maestro box and instruct it to provision the blueprint'
-    puts '            -blueprint: which blueprint to use'
-    puts '            -on: just because :)'
-    puts '            -cloud_provider: cloud provider type to be used to provision the forge.'
-    puts '                - hpcloud: uses HP public cloud http://hpcloud.com/'
-    puts '                - openstack: OpenStack based private or public cloud'
-    puts '                - more to come'
-    puts '            -as: just because :)'
-    puts '            -name: name for the maestro box'
-    puts '            -test: this will delete everything after it finish to install the forge'
-    puts '            example: forj boot redstone on hpcloud as redstone01'
-    puts '        down: delete the Maestro box and all systems installed by the blueprint'
-    puts '            -name: name for the maestro box'
-    puts '        setup: set the credentials for forj cli'
-    puts '            -credentials:'
-    puts '              hpcloud:'
-    puts '                  access_key: access key from hpcloud'
-    puts '                  secret_key: secret key from hpcloud'
-    puts '                  auth_uri: identity endpoint'
-    puts '                  tenant_id: id for the tenant you want to use'
-    puts '                  availability_zone: which availability zone will be deployed'
+    puts 'Forj cli help'
     puts ''
+    puts '  forj setup   # Set the credentials for forj.'
+    puts '    required credentials:'
+    puts '      access_key: access key from hpcloud'
+    puts '      secret_key: secret key from hpcloud'
+    puts '      auth_uri: identity endpoint'
+    puts '      tenant_id: id for the tenant you want to use'
+    puts '      availability_zone: which availability zone will be deployed'
+    puts ''
+    puts '  forj boot    # Boot a new forge with the following options'
+    puts '    required:'
+    puts '      blueprint: name of the blueprint (currently cli only supports redstone)'
+    puts '      on: just to have a natural description'
+    puts '      cloud_provider: in which cloud provider to deploy the forge'
+    puts '      as: just to have a natural description'
+    puts '      name: name of the forge'
+    puts '    example:'
+    puts '      forj boot redstone on hpcloud as maestro_test'
+    puts '    optional:'
+    puts '      -b build: replace the default build.sh'
+    puts '      -bcd build_config_dir: defines the build configuration directory to load the build configuration file'
+    puts '      -bc build_config: the build config file to load <confdir>/<BoxName>.<Config>.env.'
+    puts '      -gb branch: the build will extract from git branch name'
+    puts '      -tb test_box (not yet implemented): create test-box meta from the repository path provided.'
+    puts '      -gr git_repo: the box built will use a different git repository sent out to <user_data>'
+    puts '      -bh boothook: by default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
+    puts '      -bn box_name: defines the name of the box or box image to build.'
+    puts ''
+    puts '  forj ssh     # Connect through ssh to an existing instance'
+    puts '    required:'
+    puts '      name: name of the forge (maestro_test)'
+    puts '      node: name of the node (maestro, ci, etc...)'
+    puts ''
+    puts '  forj down    # Delete a forge and create a backup of your data'
+    puts '    not yet implemented'
+    puts ''
+    puts '  forj help    # Display this help'
   end
 
   desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
 
   method_option :build,            :aliases => '-b',   :desc => 'Replace the default build.sh'
   method_option :build_config_dir, :aliases => '-bcd', :desc => 'Defines the build configuration directory to load the build configuration file. You can set FORJ_BLD_CONF_DIR. By default, it will look in your current directory.'
   method_option :build_config,     :aliases => '-bc',  :desc => 'The build config file to load <confdir>/<BoxName>.<Config>.env. By default, uses "master" as Config.'
   method_option :branch,           :aliases => '-gb',  :desc => 'The build will extract from git branch name. It sets the configuration build <config> to the branch name <branch>.'
   method_option :test_box,         :aliases => '-tb',  :desc => 'Create test-box meta from the repository path provided.'
   method_option :git_repo,         :aliases => '-gr',  :desc => 'The box built will use a different git repository sent out to <user_data>. This repository needs to be read only. No keys are sent.'
-  method_option :boothook,         :aliases => '-b',   :desc => 'By default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
+  method_option :boothook,         :aliases => '-bh',   :desc => 'By default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
   method_option :box_name,         :aliases => '-bn',  :desc => 'Defines the name of the box or box image to build.'
 
   def boot(blueprint, on, cloud_provider, as, name, test = false)
       Boot.boot(blueprint, cloud_provider, name,
                 options[:build], options[:build_config_dir],
@@ -81,11 +95,11 @@
   def down(name)
     Down.down(name)
   end
 
   desc 'ssh', 'connect to your forge thru ssh'
-  def ssh
-    Ssh.connect
+  def ssh(name, server)
+    Ssh.connect(name, server)
   end
 
   desc 'setup', 'set the credentials for forj cli'
   def setup
     Setup.setup