forj 0.0.26 → 0.0.27

data/Gemfile

@@ -25,5 +25,5 @@ gem 'fog', '1.19.0'
 gem 'git', '>=1.2.7'
 gem 'rainbow'
 gem 'rbx-require-relative', '~> 0.0.7'
-gem 'thor', '~>0.16.0'
+gem 'thor', '~>0.19.1'
 gem 'hpcloud', '~>2.0.8'

data/bin/forj

@@ -25,10 +25,11 @@ require_relative '../lib/down.rb'
 include Down
 require_relative '../lib/setup.rb'
 include Setup
+require_relative '../lib/ssh.rb'
+include Ssh
 
 
 class Forj < Thor
-
   desc 'help', 'Display forj cli help'
   def help
     puts 'forj cli commands'
@@ -47,56 +48,49 @@ class Forj < Thor
     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 ''
-    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 '            -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 ''
   end
 
   desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
 
-  method_option :build_conf_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_conf, :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 :box_name, :aliases       => '-bn', :desc  => 'Defines the name of the box or box image to build.'
+  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 :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)
-    build_conf_dir = options[:build_conf_dir]
-    branch = options[:branch]
-    unless branch
-      branch = 'master'
-    end
-    if options[:build_conf_dir]
-      Boot::boot(blueprint, cloud_provider, name, build_conf_dir, branch, test)
-    else
-      Boot::boot(blueprint, cloud_provider, name, nil, nil, test)
-    end
-
+      Boot.boot(blueprint, cloud_provider, name,
+                options[:build], options[:build_config_dir],
+                options[:build_config], options[:branch],
+                options[:git_repo], options[:boothook],
+                options[:box_name], test)
   end
 
   desc 'down', 'delete the Maestro box and all systems installed by the blueprint'
   def down(name)
-    Down::down(name)
+    Down.down(name)
   end
 
   desc 'ssh', 'connect to your forge thru ssh'
   def ssh
-    puts 'ssh'
+    Ssh.connect
   end
 
   desc 'setup', 'set the credentials for forj cli'
   def setup
-    Setup::setup
+    Setup.setup
   end
-
 end
 
 

data/lib/boot.rb

@@ -35,7 +35,10 @@ include Helpers
 # Boot module
 #
 module Boot
-  def boot(blueprint, cloud_provider, name, build_config_dir, branch, test = false)
+  def boot(blueprint, cloud_provider, name,
+           build, build_config_dir, build_config,
+           branch, git_repo, boothook, box_name,
+           test = false)
     begin
       initial_msg = 'booting %s on %s' % [blueprint , cloud_provider]
 
@@ -74,13 +77,21 @@ module Boot
       build_path = home + '/.forj/maestro/build'
       Dir.chdir(build_path)
 
-      if build_config_dir
-        command = 'bin/build.sh --build_ID maestro.%s --box-name maestro --build-conf-dir %s --build-config box-13.5 --gitBranch %s' % [name,build_config_dir, branch]
-      elsif blueprint != 'redstone'
-        command = 'bin/build.sh --build_ID %s --box-name maestro --build-conf-dir ~/.forj/maestro/build/conf --build-config box --blueprint %s' % [name, blueprint]
-      else
-        command = 'bin/build.sh --build_ID %s --box-name maestro --build-conf-dir ~/.forj/maestro/build/conf --build-config box' % [name]
-      end
+      build = 'bin/build.sh' unless build
+
+      build_config_dir = '~/.forj/maestro/build/conf' unless build_config_dir
+
+      build_config = 'box' unless build_config
+
+      branch = 'master' unless branch
+
+      git_repo = 'review:forj-oss/maestro' unless git_repo
+
+      box_name = 'maestro' unless box_name
+
+      boothook = '~/.forj/maestro/build/bin/build-tools/boothook.sh' unless boothook
+
+      command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --gitRepo %s --boothook %s' % [build, name, box_name, build_config_dir, build_config, branch, git_repo, boothook]
 
       Kernel.system(command)
       Dir.chdir(current_dir)

data/lib/ssh.rb

@@ -13,4 +13,13 @@
 #    distributed under the License is distributed on an "AS IS" BASIS,
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
-#    limitations under the License.
+#    limitations under the License.
+
+#
+# ssh module
+#
+module Ssh
+  def connect
+    puts 'ssh'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &6798920 !ruby/object:Gem::Requirement
+  requirement: &13745640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
-  version_requirements: *6798920
+  version_requirements: *13745640
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &6798140 !ruby/object:Gem::Requirement
+  requirement: &13791200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.11
   type: :runtime
   prerelease: false
-  version_requirements: *6798140
+  version_requirements: *13791200
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &6794340 !ruby/object:Gem::Requirement
+  requirement: &13788180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *6794340
+  version_requirements: *13788180
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: &6793360 !ruby/object:Gem::Requirement
+  requirement: &13673420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *6793360
+  version_requirements: *13673420
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &6792560 !ruby/object:Gem::Requirement
+  requirement: &13672220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *6792560
+  version_requirements: *13672220
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &6791900 !ruby/object:Gem::Requirement
+  requirement: &13670800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *6791900
+  version_requirements: *13670800
 description: forj command line
 email:
 - forj@forj.io
@@ -110,13 +110,10 @@ files:
 - Rakefile
 - Gemfile
 - README.md
-- .rspec
-- .rubocop.yml
 homepage: https://forj.io
 licenses:
 - Apache License, Version 2.0.
-post_install_message: ! "Go to docs.forj.io for more\n                           information
-  on how to use forj cli"
+post_install_message: Go to docs.forj.io for more information on how to use forj cli
 rdoc_options: []
 require_paths:
 - lib

data/.rspec

@@ -1,3 +0,0 @@
---color
---warnings
---require spec_helper

data/.rubocop.yml

@@ -1,22 +0,0 @@
-# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-# limit lines to 80 characters.
-LineLength:
-  Max: 200
-  Enabled: true
-# disabled while we still support ruby 1.8
-HashSyntax:
-  Description: 'Prefer Ruby 1.9 hash syntax over 1.8 syntax'
-  Enabled: false