forj 0.0.19 → 0.0.20

data/bin/forj

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -61,39 +62,45 @@ class Forj < Thor
   end
 
   desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
-  method_option :build_conf_dir, :aliases => '-c', :desc => 'build config dir to use'
-  method_option :branch, :aliases => '-b', :desc => 'branch to use'
-  method_option :test_box, :aliases => '-t', :desc => 'test box'
-  def boot(blueprint, on, cloud_provider, as, name, test=false)
+
+  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.'
+
+  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)
+      Boot::boot(blueprint, cloud_provider, name, build_conf_dir, branch, test)
     else
-      Boot.boot(blueprint, cloud_provider, name, nil, nil, test)
+      Boot::boot(blueprint, cloud_provider, name, nil, nil, test)
     end
 
   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', ''
+  desc 'ssh', 'connect to your forge thru ssh'
   def ssh
     puts 'ssh'
   end
 
   desc 'setup', 'set the credentials for forj cli'
   def setup
-    Setup.setup
+    Setup::setup
   end
 
 end
 
 
-Forj.start
+Forj.start

data/lib/boot.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -16,8 +17,6 @@
 
 require 'require_relative'
 
-require_relative 'compute.rb'
-include Compute
 require_relative 'network.rb'
 include Network
 require_relative 'yaml_parse.rb'
@@ -27,12 +26,15 @@ include SecurityGroup
 require_relative 'repositories.rb'
 include Repositories
 
-
+#
+# Boot module
+#
 module Boot
-  def boot(blueprint, cloud_provider, name, build_config_dir, branch, test=false)
+  def boot(blueprint, cloud_provider, name, build_config_dir, branch, test = false)
     begin
 
-      puts 'booting %s on %s' % [blueprint, cloud_provider]
+      puts format('booting %{blueprint} on %{cloud_provider}',
+                  blueprint: blueprint , cloud_provider: cloud_provider)
 
       # get definitions from yaml
       forj_dir = File.expand_path(File.dirname(__FILE__))
@@ -46,10 +48,10 @@ module Boot
       network = Network.create_network(name)
       subnet = Network.create_subnet(network.id, name)
       router = Network.get_router(definitions[blueprint]['router'])
-      Network.create_router_interface(subnet.id, router)
+      Network::create_router_interface(subnet.id, router)
 
       # create the security groups for the blueprint
-      security_group = SecurityGroup.create_security_group(blueprint)
+      security_group = SecurityGroup::create_security_group(blueprint)
 
       ports = definitions['redstone']['ports']
 
@@ -68,10 +70,12 @@ module Boot
       build_path = home + '/.hpcloud/maestro/build'
       Dir.chdir(build_path)
 
-      if build_config_dir != nil
-        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]
+      if build_config_dir
+        command = format('bin/build.sh --build_ID maestro.%{name} --box-name maestro --build-conf-dir %{build_config_dir} --build-config box-13.5 --gitBranch %{branch}', name: name, build_config_dir: build_config_dir, branch: branch)
+      elsif name != 'redstone'
+        command = format('bin/build.sh --build_ID %{name} --box-name maestro --build-conf-dir ~/.hpcloud/maestro/build/conf --build-config box --blueprint %{blueprint_name}', name: name, blueprint_name: blueprint)
       else
-        command = 'bin/build.sh --build_ID %s --box-name maestro --build-conf-dir ~/.hpcloud/maestro/build/conf --build-config box' % [name]
+        command = format('bin/build.sh --build_ID %{name} --box-name maestro --build-conf-dir ~/.hpcloud/maestro/build/conf --build-config box', name: name)
       end
 
       Kernel.system(command)
@@ -86,10 +90,8 @@ module Boot
 
     rescue SystemExit, Interrupt
       puts 'process interrupted by user'
-    rescue Exception => e
+    rescue StandardError => e
       puts e
     end
-
   end
-
-end
+end

data/lib/connection.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -20,6 +21,9 @@ require 'require_relative'
 require_relative 'yaml_parse.rb'
 include YamlParse
 
+#
+# Connection module
+#
 module Connection
 
   def compute
@@ -42,7 +46,7 @@ module Connection
         :hp_secret_key   => credentials['secret_key'],
         :hp_auth_uri     => credentials['auth_uri'],
         :hp_tenant_id    => credentials['tenant_id'],
-        :hp_avl_zone     => credentials['availability_zone'],
+        :hp_avl_zone     => credentials['availability_zone']
     })
   end
 

data/lib/down.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -16,8 +17,6 @@
 
 require 'require_relative'
 
-require_relative 'compute.rb'
-include Compute
 require_relative 'network.rb'
 include Network
 require_relative 'yaml_parse.rb'
@@ -25,29 +24,40 @@ include YamlParse
 require_relative 'security.rb'
 include SecurityGroup
 
+#
+# Down module
+#
 module Down
   def down(name)
-    puts 'deleting %s...' % [name]
+    begin
+
+      puts format('deleting %{name}...', name: name)
+
+      definitions = YamlParse::get_values('../lib/catalog.yaml')
 
-    definitions = YamlParse.get_values('../lib/catalog.yaml')
+      # first step is to delete the instance
+      Compute.delete_instance(name)
 
-    # first step is to delete the instance
-    Compute.delete_instance(name)
+      # get the subnet
+      subnet = Network::get_subnet(name)
 
-    # get the subnet
-    subnet = Network.get_subnet(name)
+      # delete the router interface
+      router = Network::get_router(definitions['redstone']['router'])
+      Network.delete_router_interface(subnet.id, router)
 
-    # delete the router interface
-    router = Network.get_router(definitions['redstone']['router'])
-    Network.delete_router_interface(subnet.id, router)
+      # delete subnet
+      Network.delete_subnet(subnet.id)
 
-    # delete subnet
-    Network.delete_subnet(subnet.id)
+      # delete security group
+      # Network.delete_security_group(security_group.id)
 
-    # delete security group
-    # Network.delete_security_group(security_group.id)
+      # delete network
+      Network.delete_network(name)
 
-    # delete network
-    Network.delete_network(name)
+    rescue SystemExit, Interrupt
+      puts 'process interrupted by user'
+    rescue Exception => e
+      puts e
+    end
   end
-end
+end

data/lib/network.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -19,6 +20,9 @@ require 'require_relative'
 require_relative 'connection.rb'
 include Connection
 
+#
+# Network module
+#
 module Network
 
   def create_network(name)
@@ -83,7 +87,8 @@ end
 def get_next_subnet
   subnet_values = Array.new
   subnets = Connection.network.subnets.all
-  for s in subnets do
+
+  subnets.each do|s|
     subnet_values.push(s.cidr)
   end
 
@@ -95,11 +100,11 @@ def get_next_subnet
 
   subnet_values = subnet_values.sort!
 
-  for value in subnet_values
+  subnet_values.each do|value|
     range_used.push(value[5])
   end
 
-  for n in range_used
+  range_used.each do |n|
     if count.to_i == n.to_i
     else
       new_subnet = count
@@ -117,5 +122,4 @@ def get_next_subnet
     new_cidr  = '10.0.%s.0/24' % [new_subnet]
   end
   new_cidr
-
-end
+end

data/lib/repositories.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -21,10 +22,13 @@ require 'require_relative'
 require_relative 'yaml_parse.rb'
 include YamlParse
 
+#
+# Repositories module
+#
 module Repositories
   def clone_repo
 
-    definitions = YamlParse.get_values('../lib/catalog.yaml')
+    definitions = YamlParse::get_values('../lib/catalog.yaml')
     maestro_url = definitions['default']['maestro']
 
     home = File.expand_path('~')
@@ -38,8 +42,8 @@ module Repositories
         Git.clone(maestro_url, 'maestro', :path => path)
       end
     rescue
-      puts 'Error while cloning the repo from %s' % [maestro_url]
+      puts format('Error while cloning the repo from %{maestro_url}', maestro_url: maestro_url)
       puts 'If this error persist you could clone the repo manually in ~/.hpcloud/'
     end
   end
-end
+end

data/lib/security.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -19,12 +20,13 @@ require 'require_relative'
 require_relative 'connection.rb'
 include Connection
 
-# create a security group for each blueprint
-
+#
+# SecurityGroup module
+#
 module SecurityGroup
 
   def create_security_group(name)
-    description = 'Security group for blueprint %s' % [name]
+    description = format('Security group for blueprint %{name}', name: name)
     Connection.network.security_groups.create(
         :name => name,
         :description => description
@@ -46,25 +48,11 @@ module SecurityGroup
           :remote_ip_prefix => '0.0.0.0/0'
       )
     rescue StandardError
-      puts 'error creating the rule for port %s' % [port_min]
+      puts format('error creating the rule for port %{port_min}', port_min: port_min)
     end
-
   end
 
   def delete_security_group_rule(rule_id)
     Connection.network.security_group_rules.get(rule_id).destroy
   end
-
-  def upload_keypair(name)
-    begin
-      home = File.expand_path('~')
-      path = home + '/.hpcloud/' + name
-      # this will create a new keypair
-      key_pair = Connection.compute.key_pairs.create(:name => name)
-      key_pair.write(path)
-    rescue StandardError
-      puts 'error uploading the keypair'
-    end
-  end
-
-end
+end

data/lib/setup.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -14,8 +15,12 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+#
+# Setup module call the hpcloud functions
+#
 module Setup
   def setup
+    # delegate the initial configuration to hpcloud (unix_cli)
     Kernel.system('hpcloud account:setup')
     Kernel.system('hpcloud keypairs:add nova')
   end

data/lib/ssh.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #

data/lib/yaml_parse.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
@@ -16,8 +17,11 @@
 
 require 'yaml'
 
+#
+# YamlParse module
+#
 module YamlParse
   def get_values(path_to_yaml)
     YAML.load_file(path_to_yaml)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &18152220 !ruby/object:Gem::Requirement
+  requirement: &12245580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *18152220
+  version_requirements: *12245580
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &18149360 !ruby/object:Gem::Requirement
+  requirement: &12245000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.22.1
   type: :runtime
   prerelease: false
-  version_requirements: *18149360
+  version_requirements: *12245000
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: &18147220 !ruby/object:Gem::Requirement
+  requirement: &12244360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *18147220
+  version_requirements: *12244360
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &18145480 !ruby/object:Gem::Requirement
+  requirement: &12243700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *18145480
+  version_requirements: *12243700
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &18144380 !ruby/object:Gem::Requirement
+  requirement: &12242860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *18144380
+  version_requirements: *12242860
 description: forj command line
 email:
 - forj@forj.io
@@ -75,7 +75,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/forj
-- lib/compute.rb
 - lib/connection.rb
 - lib/network.rb
 - lib/security.rb
@@ -89,7 +88,8 @@ files:
 homepage: https://forj.io
 licenses:
 - Apache License, Version 2.0.
-post_install_message: Go to docs.forj.io for more information on how to use forj cli
+post_install_message: ! "Go to docs.forj.io for more\n                           information
+  on how to use forj cli"
 rdoc_options: []
 require_paths:
 - lib

data/lib/compute.rb

@@ -1,62 +0,0 @@
-#!/usr/bin/env ruby
-
-# (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.
-
-require 'require_relative'
-
-require_relative 'connection.rb'
-include Connection
-
-module Compute
-
-  def get_image(image_name)
-    compute = Connection.compute
-
-    images = compute.images.all
-    image = nil
-
-    for i in images do
-      if i.name == image_name
-        image = i
-      end
-    end
-    image
-  end
-
-  def get_flavor(flavor_name)
-    compute = Connection.compute
-
-    flavors = compute.flavors.all
-    flavor = nil
-
-    for f in flavors do
-      if f.name == flavor_name
-        flavor = f
-      end
-    end
-    flavor
-  end
-
-  def delete_instance(maestro)
-    result = Connection.compute.servers.all(:name => maestro)[0]
-    name = result.name
-    if name.include? maestro
-      Connection.compute.servers.get(result.id).destroy
-    else
-      puts '%s not found' % [maestro]
-    end
-  end
-
-end