forj 0.0.31 → 0.0.32

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9b005cfdf0378f6542960384a955b0178b6fba87
+  data.tar.gz: 36c3649b97b76407bec1ea5abcc7a56b56df89df
+SHA512:
+  metadata.gz: c04216e0b8ebf47678739a6d926ad00e30160d53648432cb2bf9c175da4b5bc90e86ca0e8f48d906248ea8a8f89a1f4c29e9840b6bba56038d377d519b67556a
+  data.tar.gz: 092c8482f8bd958e6fbdbbe12b39866755b43a600895e00b15301ca5925385b9da9e697f8431a31e004f251af8326306d6a5ddc9e48a0ce250dd69ccb1efd398

data/README.md

@@ -5,11 +5,14 @@ Forj cli
 Installation
 =====================
 For ruby 2.0
-  Fedora/CentOS/Redhat/rpm like system : 
+
+Fedora/CentOS/Redhat/rpm like system
+
     sudo yum install ruby-dev build-essential libopenssl-ruby libssl-dev zlib1g-dev -y
     sudo gem install forj
 
-  Ubuntu/Debian/debian like system (not tested)
+Ubuntu/Debian/debian like system (not tested)
+
     sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev -y
     sudo gem install forj
 
@@ -53,7 +56,27 @@ Optional arguments
     -x --box_name # Defines the name of the box or box image to build.
     -k --key_name # Key pair name to import.
     -p --key_path # Public key pair data.
-
+    -y --catalog # A path for the yaml file data about the blueprint
+
+Catalog.yaml example
+
+    redstone:
+      image: proto2b
+      flavor: standard.xsmall
+      ports: [22, 80, 443, 3131, 3000, 3132, 3133, 3134, 3135, 4505, 4506, 5000, 5666, 8000, 8080, 8081, 8083, 8125, 8139, 8140, 8773, 8774, 8776, 9292, 29418, 35357]
+      keypair_path: ~/.hpcloud/keypairs/nova
+      keypair_name: nova
+      router: private-ext
+      security_group: default
+      network: private
+      # at this point you have to clone the infra project manually
+      build_config_dir: ~/forj/infra/build/boxes/maestro
+      build_config: box-13.5
+      branch: master
+      box_name: maestro
+      infra: ~/.forj/infra
+    default:
+      maestro: https://github.com/forj-oss/maestro.git
 To ssh into a server
 
     forj ssh <name> <node>

data/bin/forj

@@ -34,24 +34,23 @@ class Forj < Thor
   def help
     puts 'Forj cli help'
     puts ''
-    puts '  forj setup   # Set the credentials for forj.'
-    puts '    required credentials:'
+    puts '  forj setup   # Set the credentials for forj. Currently supports only hpcloud provider.'
+    puts '    Several data will be requested like:'
     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 '  forj boot <Blueprint> on <Provider> as <InstanceName> [options]  # Boot a new forge with the following options'
+    puts '    where:'
+    puts '      blueprint    : Is the name of the blueprint (currently cli only supports redstone)'
+    puts '      Provider     : in which cloud provider to deploy the forge'
+    puts '      InstanceName : name of the forge'
+    puts ''
+    puts '    Ex: forj boot redstone on hpcloud as maestro_test'
+    puts ''
+    puts '    [Options] are:'
     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.'
@@ -61,12 +60,12 @@ class Forj < Thor
     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 '  forj ssh <Name> <Node>    # Connect through ssh to an existing instance'
+    puts '    where'
+    puts '      InstanceName: is the name of the forge (maestro_test)'
+    puts '      Node        : is the name of the node (maestro, ci, etc...)'
     puts ''
-    puts '  forj down    # Delete a forge and create a backup of your data'
+    puts '  forj down  <InstanceName>  # Delete a forge and create a backup of your data'
     puts '    not yet implemented'
     puts ''
     puts '  forj help    # Display this help'
@@ -75,7 +74,7 @@ class Forj < Thor
   desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
 
   method_option :build,            :aliases => '-u',   :desc => 'Replace the default build.sh'
-  method_option :build_config_dir, :aliases => '-d',   :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 :infra,            :aliases => '-I',   :desc => 'Defines the Infra directory to load the build configuration file. You can set FORJ_INFRA_DIR. By default, it will look in your current directory.'
   method_option :build_config,     :aliases => '-c',   :desc => 'The build config file to load <confdir>/<BoxName>.<Config>.env. By default, uses "master" as Config.'
   method_option :branch,           :aliases => '-b',   :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 => '-t',   :desc => 'Create test.rb-box meta from the repository path provided.'

data/lib/boot.rb

@@ -15,8 +15,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'require_relative'
+
+
 
 require_relative 'network.rb'
 include Network
@@ -36,58 +36,72 @@ include Helpers
 #
 module Boot
   def boot(blueprint, cloud_provider, name,
-      build, build_config_dir, build_config,
+      build, infra_dir, build_config,
       branch, git_repo, boothook, box_name,
       key_name, key_path, region, catalog,
       test = false)
     begin
-      initial_msg = 'booting %s on %s' % [blueprint , cloud_provider]
+      initial_msg = 'booting %s on %s (~/.forj/forj.log)' % [blueprint , cloud_provider]
 
       Logging.info(initial_msg)
-      puts (initial_msg)
+      puts ('INFO: Reading default configuration...')
 
       forj_dir = File.expand_path(File.dirname(__FILE__))
       Dir.chdir(forj_dir)
 
+      #TODO: Consider defaults.yaml as default variables, and load more from ~/.forj/forj-config.yaml, to change defaults on user need.
       if catalog
         definitions = YamlParse.get_values(catalog)
       else
-        definitions = YamlParse.get_values('catalog.yaml')
+        definitions = YamlParse.get_values('defaults.yaml')
       end
+      
+      # Initialize defaults
+      maestro_url =  definitions['default']['maestro_url']
 
-      maestro_url =  definitions['default']['maestro']
-
-      Repositories.clone_repo(maestro_url)
-      infra_exists = nil
+      infra_dir = definitions['default']['infra_repo'] unless infra_dir
 
-      begin
-        if File.directory?(definitions[blueprint]['infra'])
-          infra_exists = true
-        else
-          Repositories.create_infra
-        end
-      rescue => e
-        infra_exists = false
-        puts e.message
+      # Ask information if needed.
+      bBuildInfra=false
+      if not Dir.exist?(File.expand_path(infra_dir))
+         sAsk = 'Your \'%s\' infra directory doesn\'t exist. Do you want to create a new one from Maestro(repo github)/templates/infra (yes/no)?' % [infra_dir]
+         bBuildInfra=agree(sAsk)
+      else
+         puts('INFO: Re-using your infra... in \'%s\'' % [infra_dir])
+      end
+      if not Dir.exist?(File.expand_path(infra_dir)) and not bBuildInfra
+         puts ('Exiting.')
+         return
       end
 
+      # Step Maestro Clone
+      puts('INFO: cloning maestro repo from \'%s\'...' % maestro_url)
+      Repositories.clone_repo(maestro_url)
+      
+      if bBuildInfra
+         puts('INFO: Building your infra... in \'%s\'' % [infra_dir])
+         Repositories.create_infra
+      end
 
-      network = Network.get_or_create_network(definitions[blueprint]['network'])
+      puts('INFO: Configuring network \'%s\'' % [definitions['default']['network']])
+      network = Network.get_or_create_network(definitions['default']['network'])
       begin
         subnet = Network.get_or_create_subnet(network.id, name)
-        router = Network.get_router(definitions[blueprint]['router'])
+        router = Network.get_router(definitions['default']['router'])
         Network.create_router_interface(subnet.id, router)
       rescue => e
         puts e.message
       end
 
-      security_group = SecurityGroup.get_or_create_security_group(definitions[blueprint]['security_group'])
 
-      key_name = definitions[blueprint]['keypair_name'] unless key_name
-      key_path = definitions[blueprint]['keypair_path'] unless key_path
+      puts('INFO: Configuring keypair \'%s\'' % [definitions['default']['keypair_name']])
+      key_name = definitions['default']['keypair_name'] unless key_name
+      key_path = definitions['default']['keypair_path'] unless key_path
       SecurityGroup.upload_existing_key(key_name, key_path)
 
-      ports = definitions[blueprint]['ports']
+      puts('INFO: Configuring Security Group \'%s\'' % [definitions['default']['security_group']])
+      security_group = SecurityGroup.get_or_create_security_group(definitions['default']['security_group'])
+      ports = definitions['default']['ports']
 
       ports.each do|port|
         Network.get_or_create_rule(security_group.id, 'tcp', port, port)
@@ -102,6 +116,7 @@ module Boot
       end
 
       # run build.sh to boot maestro
+      puts
       current_dir = Dir.pwd
       home = Helpers.get_home_path
       build_path = home + '/.forj/maestro/build'
@@ -109,23 +124,19 @@ module Boot
 
       build = 'bin/build.sh' unless build
 
-      if infra_exists
-        build_config_dir = definitions[blueprint]['infra'] unless build_config_dir
-      else
-        build_config_dir = definitions[blueprint]['build_config_dir'] unless build_config_dir
-      end
-
-      build_config = definitions[blueprint]['build_config'] unless build_config
+      build_config = definitions['default']['build_config'] unless build_config
 
-      branch = definitions[blueprint]['branch'] unless branch
+      branch = definitions['default']['branch'] unless branch
 
-      box_name = definitions[blueprint]['box_name'] unless box_name
+      box_name = definitions['default']['box_name'] unless box_name
 
-      meta = '--meta blueprint=%s --meta HPCLOUD_PRIV=~/.cache/forj/master.forj-13.5.g64' % [blueprint]
+      meta = '--meta blueprint=%s' % [blueprint]
 
-      command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --debug-box %s' % [build, name, box_name, build_config_dir, build_config, branch, meta]
+      command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --debug-box %s' % [build, name, box_name, infra_dir, build_config, branch, meta]
 
-      Logging.info('using build.sh for %s' % [name])
+      Logging.info('Calling build.sh')
+      Logging.info(command)
+      
       Kernel.system(command)
       Dir.chdir(current_dir)
 
@@ -142,6 +153,9 @@ module Boot
       Logging.info(msg)
     rescue StandardError => e
       Logging.error(e.message)
+      puts e.backtrace.join("\n")
+
+      puts e.message
     end
   end
 end

data/lib/{catalog.yaml → defaults.yaml}

@@ -12,7 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-redstone:
+default:
+  maestro_url: https://github.com/forj-oss/maestro.git
+  infra_repo: ~/.forj/infra
   image: proto2b
   flavor: standard.xsmall
   ports: [22, 80, 443, 3131, 3000, 3132, 3133, 3134, 3135, 4505, 4506, 5000, 5666, 8000, 8080, 8081, 8083, 8125, 8139, 8140, 8773, 8774, 8776, 9292, 29418, 35357]
@@ -23,16 +25,6 @@ redstone:
   network: private
   # at this point you have to clone the infra project manually
   build_config_dir: ~/forj/infra/build/boxes/maestro
-  build_config: box-13.5
+  build_config: box
   branch: master
   box_name: maestro
-  infra: ~/.forj/infra
-
-
-modus:
-  ports: []
-  keypair: nova
-  router: private-ext
-
-default:
-  maestro: https://github.com/forj-oss/maestro.git

data/lib/repositories.rb

@@ -50,6 +50,7 @@ module Repositories
       end
       Dir.chdir(current_dir)
   end
+  
   def create_infra
     home = File.expand_path('~')
     path = home + '/.forj/'
@@ -68,4 +69,4 @@ module Repositories
     fill_template = 'python build-env.py -p ~/.forj/infra --maestro-path ~/.forj/maestro'
     Kernel.system(fill_template)
   end
-end
+end

data/lib/setup.rb

@@ -17,6 +17,7 @@
 
 require 'rubygems'
 require 'require_relative'
+require 'highline/import'
 
 require_relative 'yaml_parse.rb'
 include YamlParse
@@ -36,14 +37,14 @@ end
 
 def setup_credentials
   puts 'Enter hpcloud username: '
-  hpcloud_os_user = $stdin.gets
-  puts 'Enter hpcloud password: '
-  hpcloud_os_key = $stdin.gets
+  hpcloud_os_user = ask('Enter hpcloud username: ')
+  hpcloud_os_key = ask('Enter hpcloud password: ') { |q| q.echo = '*'}
 
   home = File.expand_path('~')
   creds = '%s/.cache/forj/creds' % [home]
   File.open(creds, 'w') {|file|
     file.write('HPCLOUD_OS_USER=%s' % [hpcloud_os_user])
+    file.write("\n")
     file.write('HPCLOUD_OS_KEY=%s' % [hpcloud_os_key])
   }
 end

data/lib/yaml_parse.rb

@@ -26,7 +26,7 @@ include Logging
 module YamlParse
   def get_values(path_to_yaml)
     begin
-      Logging.info('getting values from catalog.yaml, this will be a service catalog.forj.io')
+      Logging.info('getting values from defaults.yaml, this will be a service catalog.forj.io')
       YAML.load_file(path_to_yaml)
     rescue => e
       Logging.error(e.message)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.31
-  prerelease: 
+  version: 0.0.32
 platform: ruby
 authors:
 - forj team
@@ -13,70 +12,102 @@ date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &4634460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *4634460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &4633120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.11
   type: :runtime
   prerelease: false
-  version_requirements: *4633120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.11
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &4629760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *4629760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: &4629180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *4629180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &4628460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *4628460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &4627320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *4627320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.21
 description: forj command line
 email:
 - forj@forj.io
@@ -91,7 +122,7 @@ files:
 - lib/network.rb
 - lib/security.rb
 - lib/yaml_parse.rb
-- lib/catalog.yaml
+- lib/defaults.yaml
 - lib/down.rb
 - lib/boot.rb
 - lib/setup.rb
@@ -116,26 +147,25 @@ files:
 homepage: https://forj.io
 licenses:
 - Apache License, Version 2.0.
+metadata: {}
 post_install_message: Go to docs.forj.io for more information on how to use forj cli
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.5
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: forj command line
 test_files: []