forj 1.0.3 → 1.0.4

data/forj.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.name        = 'forj'
   s.homepage = 'https://www.forj.io'
 
-  s.version     = '1.0.3'
-  s.date        = '2014-12-19'
+  s.version     = '1.0.4'
+  s.date        = '2015-02-10'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_runtime_dependency 'thor', '>=0.16.0'
-  s.add_runtime_dependency 'fog', '1.19.0'
+  s.add_runtime_dependency 'fog', '~>1.26.0'
   s.add_runtime_dependency 'git', '>=1.2.7'
   s.add_runtime_dependency 'highline', '>= 1.6.21'
   s.add_runtime_dependency 'ansi', '>= 1.4.3'
@@ -52,13 +52,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '1.7.5'
   s.add_runtime_dependency 'bundler'
   s.add_runtime_dependency 'nokogiri','1.5.11'
-  s.add_runtime_dependency 'lorj', '~> 0.2.0'
+  s.add_runtime_dependency 'lorj', '~> 1.0.2'
 
-  s.add_development_dependency "bundler"
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 3.1.0"
   s.rdoc_options << '--title' << 'Lorj - The Process Controllers framework system' <<
   '--main' << 'README.md'
-
-
 end

data/forj/defaults.yaml

@@ -184,19 +184,19 @@
          :desc:               "Domain name added to each hosts."
          :account_exclusive:  true
          :account:            true
-         :post_step_function: :forj_DNS_settings
+         :post_step_function: :forj_dns_settings
          :ask_step:           3
       :dns_service:
          :desc:               "DNS service region name Maestro will use."
          :account_exclusive:  true
          :account:            true
-         :pre_step_function:  :forj_DNS_settings?
+         :pre_step_function:  :forj_dns_settings?
          :ask_step:           3
       :dns_tenant_id:
          :desc:               "DNS Tenant ID Maestro will use"
          :account_exclusive:  true
          :account:            true
-         :pre_step_function:  :forj_DNS_settings?
+         :pre_step_function:  :forj_dns_settings?
          :ask_step:           3
 
   :maestro:

data/lib/appinit.rb

@@ -14,39 +14,28 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-
-require 'lorj'
-
 # Module to initialize the application
 # TODO: Cleanup about Global variables used. Should be replaced by PrcLib
 #       or other kind of setting.
-module AppInit
-
-   def AppInit.forj_initialize()
-      # Function to create FORJ paths if missing.
-
-      # Defining Global variables
-      $FORJ_DATA_PATH = File.expand_path(File.join('~', '.forj'))
-      $FORJ_ACCOUNTS_PATH = File.join($FORJ_DATA_PATH, 'accounts')
-      $FORJ_KEYPAIRS_PATH = File.join($FORJ_DATA_PATH, 'keypairs')
-      $FORJ_BUILD_PATH = File.join($FORJ_DATA_PATH, '.build')
-      $FORJ_CREDS_PATH = File.expand_path(File.join('~', '.cache', 'forj'))
-
-      # TODO: To move to an hpcloud object.
-      $HPC_KEYPAIRS = File.expand_path(File.join('~', '.hpcloud', 'keypairs'))
-      $HPC_ACCOUNTS = File.expand_path(File.join('~', '.hpcloud', 'accounts'))
-
-      AppInit.ensure_dir_exists($FORJ_DATA_PATH)
-      AppInit.ensure_dir_exists($FORJ_ACCOUNTS_PATH)
-      AppInit.ensure_dir_exists($FORJ_BUILD_PATH)
-      AppInit.ensure_dir_exists($FORJ_KEYPAIRS_PATH)
-      FileUtils.chmod(0700, $FORJ_KEYPAIRS_PATH)
-      AppInit.ensure_dir_exists($FORJ_CREDS_PATH)
-   end
-
-   def AppInit.ensure_dir_exists(path)
-      if not PrcLib.dir_exists?(path)
-       FileUtils.mkpath(path) if not File.directory?(path)
-      end
-   end
+module Forj
+  class << self
+    attr_accessor :build_path, :keypairs_path
+  end
+
+  module_function
+
+  def keypairs_path=(v)
+    @keypairs_path = File.expand_path(v) unless @keypairs_path
+    PrcLib.ensure_dir_exists(@keypairs_path)
+    begin
+      FileUtils.chmod(0700, @keypairs_path) # no-op on windows
+    rescue => e
+      fatal_error(1, e.message)
+    end
+  end
+
+  def build_path=(v)
+    @build_path = File.expand_path(v) unless @build_path
+    PrcLib.ensure_dir_exists(@build_path)
+  end
 end

data/lib/boot.rb

@@ -0,0 +1,156 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# (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 'highline/import'
+require 'cloud_connection.rb'
+#
+# Boot module
+#
+module Forj
+  # This module provides the behavior to boot your forge
+  module Boot
+    @account = nil
+    attr_accessor :account
+
+    def self.deprecated_name?(blueprint, on_or_name,
+        old_accountname, as,
+        old_name
+    )
+      # depreciated: <BluePrint> on <AccountName> as <InstanceName>
+      if old_accountname && as && old_name
+        msg = format(
+          "The syntax `forj boot '%s' on '%s' as '%s'`" \
+        " is depreciated. \nUse `forj boot '%s' '%s' ",
+          blueprint, old_accountname, old_name, blueprint, old_name
+        )
+
+        if account.get('account_name') == old_accountname
+          PrcLib.warning('%s` instead.', msg)
+        else
+          PrcLib.warning("%s -a '%s'` instead.", msg, old_accountname)
+        end
+        name = old_name
+        @account.set(:account_name, old_accountname)
+      else
+        name = on_or_name
+      end
+      name
+    end
+
+    def self.load_options(options, options_map)
+      options_map.each do |opt_key, ac_key|
+        unless options[opt_key].nil?
+          value = yield(opt_key, options[opt_key])
+          @account.set(ac_key, options[opt_key]) unless value.nil?
+        end
+      end
+    end
+
+    def self.validate_keypath(options)
+      if options[:key_path]
+        m_found = options[:key_path].match(/^(.*)(\.pub)?$/)
+        if m_found
+          key_path = File.expand_path(m_found[1])
+          if m_found[2] && !(File.exist?(
+            File.expand_path(m_found[1] + m_found[2])
+          ))
+            PrcLib.fatal(
+              1,
+              "'%s' is not a valid keypair files." \
+              ' At least the public key (.pub) is have to exist.',
+              key_path
+            )
+          end
+          @account.set(:keypair_path, key_path)
+        else
+          PrcLib.fatal(
+            1,
+            "'%s' is not a valid keypair files." \
+            'At least the public key (.pub) is have to exist.',
+            key_path
+          )
+        end
+      end
+    end
+
+    def self.install_blueprint?(blueprint, name)
+      @account[:instance_name] = name
+
+      if blueprint == 'maestro'
+        PrcLib.info("Starting boot process of '%s'. No blueprint requested.",
+                    @account[:instance_name])
+      else
+        @account[:blueprint] = blueprint
+        PrcLib.info("Starting boot process of '%s' with blueprint '%s'.",
+                    @account[:instance_name], @account[:blueprint])
+      end
+    end
+
+    def self.boot(blueprint, on_or_name, deprecated_name, options)
+      @account = Lorj::Account.new(options[:config])
+
+      name = deprecated_name?(blueprint, on_or_name, deprecated_name[0],
+                              deprecated_name[1], deprecated_name[2])
+
+      PrcLib.fatal(1, "instance name '%s' not supported. Support only lower" \
+                   ' case, numeric and dash caracters.',
+                   name) unless /^[\d[[:lower:]]-]+$/ =~ name
+
+      # Options are added if they are set.
+      # Otherwise, get will retrieve the default value.
+
+      @account[:account_name] = options[:account_name] if options[:account_name]
+
+      @account.ac_load @account[:account_name]
+
+      options_map = { :infra => :infra_repo, :key_name => :keypair_name,
+                      :key_path => :keypair_path,
+                      :security_group => :security_group,
+                      :image_name => :image_name, :maestro_flavor => :flavor,
+                      :bp_flavor => :bp_flavor, :maestro_repo => :maestro_repo,
+                      :branch => :branch, :test_box => :test_box }
+
+      load_options(options, options_map) do |key, value|
+        case key
+        when :test_box
+          path = File.expand_path(value)
+          return path if File.directory?(path)
+          return nil
+        end
+        value
+      end
+
+      PrcLib.warning(
+        'test_box is currently disabled in this version.' \
+        'It will be re-activated in newer version.'
+      ) if options[:test_box]
+
+      validate_keypath(options)
+
+      # o_cloud = get_o_cloud(o_forj_account)
+      o_cloud = Forj::CloudConnection.connect(@account)
+
+      install_blueprint?(blueprint, name)
+      PrcLib.high_level_msg("Preparing your forge '%s'.Please be patient. "\
+                            "more output in '%s'\n",
+                            @account[:instance_name],
+                            PrcLib.log_file)
+
+      o_cloud.create(:forge)
+    end
+  end
+end

data/lib/cloud_connection.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# (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.
+
+module Forj
+  # Provide cloud object
+  module CloudConnection
+    def self.connect(account)
+      a_processes = []
+
+      # Defines how to manage Maestro and forges
+      # create a maestro box. Identify a forge instance, delete it,...
+      a_processes << File.join(LIB_PATH, 'forj', 'ForjCore.rb')
+
+      # Defines how cli will control FORJ features
+      # boot/down/ssh/...
+      a_processes << File.join(LIB_PATH, 'forj', 'ForjCli.rb')
+
+      # Loading CloudCore embedding provider controller + its process.
+      o_cloud = Lorj::CloudCore.new(
+        account,
+        account[:account_name],
+        a_processes
+      )
+
+      o_cloud
+    end
+  end
+end

data/lib/cloud_test.rb

@@ -1,121 +1,139 @@
 #!/usr/bin/env ruby
 
-#require 'byebug'
+# require 'byebug'
 
-$APP_PATH = File.dirname(__FILE__)
-$LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
+APP_PATH = File.dirname(__FILE__)
+LIB_PATH = File.expand_path(File.join(File.dirname(APP_PATH), 'lib'))
 
-$LOAD_PATH << $LIB_PATH
+LOAD_PATH << LIB_PATH
 
-$LOAD_PATH << File.join($LIB_PATH, 'lib-forj', 'lib')
+LOAD_PATH << File.join(LIB_PATH, 'lib-forj', 'lib')
 
 require 'appinit.rb'
 
 # Initialize forj paths
-AppInit::forj_initialize()
+AppInit.forj_initialize
 
 # Initialize global Log object
-$FORJ_LOGGER=ForjLog.new()
+FORJ_LOGGER = ForjLog.new
 
 require 'lib-forj.rb'
 
 Logging.set_level(Logger::DEBUG)
 
 # Load global Config
-oConfig = ForjConfig.new()
+o_config = ForjConfig.new
 
-aProcesses = []
+a_processes = []
 
 # Defines how to manage Maestro and forges
 # create a maestro box. Identify a forge instance, delete it,...
-aProcesses << File.join($LIB_PATH, 'forj', 'ForjCore.rb')
+a_processes << File.join(LIB_PATH, 'forj', 'ForjCore.rb')
 
 # Defines how cli will control FORJ features
 # boot/down/ssh/...
-aProcesses << File.join($LIB_PATH, 'forj', 'ForjCli.rb')
+a_processes << File.join(LIB_PATH, 'forj', 'ForjCli.rb')
 
-$LIB_FORJ_DEBUG = 3 # verbose
+# PrcLib.core_level = 3 # verbose
 
-infra_dir = File.expand_path(oConfig.get(:infra_repo))
+infra_dir = File.expand_path(o_config.get(:infra_repo))
 
 # Ask information if needed.
-if not Dir.exist?(File.expand_path(infra_dir))
-   Logging.warning(<<-END
+unless Dir.exist?(File.expand_path(infra_dir))
+  Logging.warning(<<-END
 Your infra workspace directory is missing.
 
-Forj uses an infra workspace directory to store any kind of data that are private to you.
-We provides ways to send those data securily to your new Forge instance, as metadata.
-In production case, we suggest you to keep it safe in your SCM preferred database.
+Forj uses an infra workspace directory to store any kind of data that are
+ private to you.
+We provides ways to send those data securily to your new Forge instance,
+ as metadata.
+In production case, we suggest you to keep it safe in your SCM preferred
+ database.
 
-If you already have an existing infra workspace, use 'forj set infra_repo=<PathToYourRepo>' to set it and restart.
+If you already have an existing infra workspace,
+ use 'forj set infra_repo=<PathToYourRepo>' to set it and restart.
 
-Otherwise, we will build a new one with some predefined data, you can review and update later.
+Otherwise, we will build a new one with some predefined data,
+ you can review and update later.
    END
-   )
-   sAsk = "Do you want to create a new one from Maestro (yes/no)?" % [infra_dir]
-   bBuildInfra=agree(sAsk)
-   if not bBuildInfra
-      puts 'Process aborted on your demand.'
-      exit 0
-   end
+  )
+  s_ask = format(
+    'Do you want to create a new one from Maestro (yes/no)?',
+    infra_dir
+  )
+  b_build_infra = agree(s_ask)
+  unless b_build_infra
+    puts 'Process aborted on your demand.'
+    exit 0
+  end
 end
 
-oCloud = ForjCloud.new(oConfig, 'hpcloud', aProcesses)
-
-#oConfig.set(:instance_name, "test")
-#oCloud.Create(:metadata)
-#oCloud.Create(:infra_repository)
-#oCloud.Create(:userdata)
+o_cloud = ForjCloud.new(o_config, 'hpcloud', a_processes)
 
+# o_config.set(:instance_name, "test")
+# o_cloud.Create(:metadata)
+# o_cloud.Create(:infra_repository)
+# o_cloud.Create(:userdata)
 
-#oCloud.Setup(:server, 'hpcloud')
-#oCloud.Setup(:forge, 'hpcloud')
+# o_cloud.Setup(:server, 'hpcloud')
+# o_cloud.Setup(:forge, 'hpcloud')
 
-#oCloud.Create(:forge)
+# o_cloud.Create(:forge)
 
-#oConfig.set(:instance_name, 'servertestluis')
-#oCloud.Create(:forge)
+# o_config.set(:instance_name, 'servertestluis')
+# o_cloud.Create(:forge)
 
-oForge = oCloud.Get(:forge, "luistest")
+o_forge = o_cloud.Get(:forge, 'luistest')
 
-#Ask the user to get server(s) to destroy
+# Ask the user to get server(s) to destroy
 server_id_length = 0
 server_name_length = 0
 
-oForge[:server].each{ |server|
-  if server[:id].length() >  server_id_length
-    server_id_length = server[:id].length()
+o_forge[:server].each do |server|
+  if server[:id].length >  server_id_length
+    server_id_length = server[:id].length
   end
 
-  if server[:name].length() >  server_name_length
-    server_name_length = server[:name].length()
+  if server[:name].length >  server_name_length
+    server_name_length = server[:name].length
   end
-}
+end
 
 server_index = 1
-#Display headers
-puts "|%s |%s |%s |" % ["Index ".ljust(6), "Name".ljust(server_name_length), "ID".ljust(server_id_length) ]
-#puts "|%s |%s |%s |" % ["0", "all".ljust(server_name_length), " ".ljust(server_id_length) ]
-#Display Forge servers detail
-oForge[:server].each{ |server|
-  puts "|%s |%s |%s |" % [server_index.to_s().ljust(6), server[:name].to_s().ljust(server_name_length), server[:id].to_s().ljust(server_id_length) ]
-  server_index = server_index + 1
-}
-
-oHighLine = HighLine.new()
-
-index = oHighLine.ask("Select the index of the server to create the ssh connection", Integer)do |q|
-  q.below=oForge[:server].count + 1
-  q.above=0
+# Display headers
+puts format(
+  '|%s |%s |%s |',
+  'Index '.ljust(6),
+  'Name'.ljust(server_name_length),
+  'ID'.ljust(server_id_length)
+     )
+# Display Forge servers detail
+o_forge[:server].each do |server|
+  puts format(
+    '|%s |%s |%s |',
+    server_index.to_s.ljust(6),
+    server[:name].to_s.ljust(server_name_length),
+    server[:id].to_s.ljust(server_id_length)
+       )
+  server_index += 1
 end
 
+o_high_line = HighLine.new
+
+index = o_high_line.ask(
+  'Select the index of the server to create the ssh connection',
+  Integer
+) do |q|
+  q.below = o_forge[:server].count + 1
+  q.above = 0
+end
 
-oConfig.set(:instance_name, 'luistest')
-oConfig.set(:forge_server, oForge[:server][index - 1][:id])
-oConfig.set(:server_name, oForge[:server][index - 1][:name])
-#oConfig.set(:box, 'maestro')
-#oConfig.set(:instance_name, 'luistest')
-#oConfig.Create(:server)
-oCloud.Create(:ssh)
+o_config.set(:instance_name, 'luistest')
+o_config.set(:forge_server, o_forge[:server][index - 1][:id])
+o_config.set(:server_name, o_forge[:server][index - 1][:name])
+# o_config.set(:box, 'maestro')
+# o_config.set(:instance_name, 'luistest')
+# o_config.Create(:server)
+o_cloud.Create(:ssh)
 
-#oCloud.Query(:server, 'maestro')
+# o_cloud.Query(:server, 'maestro')