forj 1.0.3 → 1.0.4

data/lib/get.rb

@@ -0,0 +1,51 @@
+#!/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'
+
+#
+# Get module
+#
+module Forj
+  # This module gets your account/default configuration
+  module Get
+    def self.get(options, key)
+      @account = Lorj::Account.new
+      if options[:account_name]
+        get_account(options, key)
+      else
+        get_default(key)
+      end
+    end
+
+    def self.get_account(options, key)
+      if key
+        Forj::Settings.account_get(@account, options[:account_name], key)
+      else
+        Forj::Settings.account_get_all(@account, options[:account_name])
+      end
+    end
+
+    def self.get_default(key)
+      if !key
+        Forj::Settings.config_get_all(@account)
+      else
+        Forj::Settings.config_get(@account, key)
+      end
+    end
+  end
+end

data/lib/ssh.rb

@@ -15,97 +15,105 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-#~ require 'rubygems'
-
+# ~ require 'rubygems'
+require 'lorj'
 require 'highline/import'
+require 'cloud_connection.rb'
 
-#~ require 'security.rb'
-#~ include SecurityGroup
+# ~ require 'security.rb'
+# ~ include SecurityGroup
 
 #
 # ssh module
 #
 module Forj
-   module Ssh
-
-      def Ssh.connect(name, oConfig)
-         oForjAccount = Lorj::Account.new(oConfig)
-
-         oForjAccount.ac_load()
-
-         aProcesses = []
-
-         # 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')
-
-         # Defines how cli will control FORJ features
-         # boot/down/ssh/...
-         aProcesses << File.join($LIB_PATH, 'forj', 'ForjCli.rb')
-
-         oCloud = Lorj::CloudCore.new(oForjAccount, oConfig[:account_name], aProcesses)
-
-         PrcLib.state("Getting information about forge '%s'" % name)
-
-         oForge = oCloud.Get(:forge, name)
-
-         if oForge[:servers].count > 0
-            if oConfig[:box_ssh]
-               box_ssh = oConfig[:box_ssh]
-
-               oServer = nil
-               regex =  Regexp.new('%s\.%s$' % [box_ssh, name])
-
-               oForge[:servers].each { |server|
-                  oName = server[:name]
-                  next if (regex =~ oName) == nil
-                  oServer = server
-                  break
-               }
-
-               if oServer != nil
-                  #Property for :forge
-                  oConfig.set(:instance_name, name)
-                  #Property for :ssh
-                  oConfig.set(:forge_server, oServer[:id])
-
-                  oCloud.Create(:ssh)
-               else
-                  PrcLib.debug("server '%s.%s' was not found" % [oConfig[:box_ssh], name] )
-                  PrcLib.high_level_msg("server '%s.%s' was not found.\n" % [oConfig[:box_ssh], name] )
-               end
+  # This module provides the behavior to create a ssh connection
+  module Ssh
+    def self.connect(name, account)
+      o_cloud = Forj::CloudConnection.connect(account)
+
+      PrcLib.state(format("Getting information about forge '%s'", name))
+
+      o_forge = o_cloud.get(:forge, name)
+
+      if o_forge[:servers].count > 0
+        if account[:box_ssh]
+          o_server = validate_server_name(name, account, o_forge)
+
+          if !o_server.nil?
+            ssh_connection(account, o_cloud, name, o_server[:id])
+          else
+            PrcLib.debug("server '%s.%s' was not found",
+                         account[:box_ssh], name)
+            PrcLib.high_level_msg("server '%s.%s' was not found.\n",
+                                  account[:box_ssh], name)
+          end
+        else
+          o_server_number = select_forge_server(o_forge)
+
+          ssh_connection(
+            account,
+            o_cloud,
+            name,
+            o_forge[:servers][o_server_number][:id]
+          )
+        end
+      else
+        PrcLib.high_level_msg("No server(s) found for instance name '%s' \n",
+                              name)
+      end
+    end
+
+    def self.select_forge_server(o_forge)
+      # Ask the user to get server(s) to create ssh connection
+      server_list = []
+      index = 0
+      s_default = nil
+      o_forge[:servers].each do |server|
+        server_list[index] = server[:name]
+        s_default = server[:name] if server[:name].include? 'maestro'
+        index += 1
+      end
 
-           else
-               #Ask the user to get server(s) to create ssh connection
-               serverList = []
-               index = 0
-               sDefault = nil
-               oForge[:servers].each{ |server|
-                  serverList[index] = server[:name]
-                  sDefault = server[:name] if server[:name].include? "maestro"
-                  index = index + 1
-               }
+      say(format(
+            'Select box for ssh connection %s',
+            ((s_default.nil?) ? '' : format(
+              'Default: ' + "|%s|\n", s_default
+            ))
+          )
+      )
+      value = choose do |q|
+        q.choices(*server_list)
+        q.default = s_default unless s_default.nil?
+      end
 
-               say("Select box for ssh connection %s" % ((sDefault.nil?)? "" : "Default: " + "|%s|\n" % sDefault))
-               value = choose { | q |
-                  q.choices(*serverList)
-                  q.default = sDefault if not sDefault.nil?
-               }
+      o_server_number = server_list.index(value)
+      o_server_number
+    end
 
-               oServerNumber = serverList.index(value)
+    def self.ssh_connection(account, o_cloud, name, server_id)
+      # Property for :forge
+      account.set(:instance_name, name)
+      # Property for :ssh
+      account.set(:forge_server, server_id)
 
-               #Property for :forge
-               oConfig.set(:instance_name, name)
-               #Property for :ssh
-               oConfig.set(:forge_server, oForge[:servers][oServerNumber][:id])
+      o_cloud.create(:ssh)
+    end
 
-               oCloud.Create(:ssh)
+    def self.validate_server_name(name, account, o_forge)
+      box_ssh = account[:box_ssh]
 
-            end
-         else
-            PrcLib.high_level_msg("No server(s) found for instance name '%s' \n" % name )
-         end
+      o_server = nil
+      regex =  Regexp.new(format('%s\.%s$', box_ssh, name))
 
+      o_forge[:servers].each do |server|
+        o_name = server[:name]
+        next if (regex =~ o_name).nil?
+        o_server = server
+        break
       end
-   end
+
+      o_server
+    end
+  end
 end

data/spec/boot_spec.rb

@@ -14,4 +14,3 @@
 #    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.
-

data/spec/spec_helper.rb

@@ -1,12 +1,13 @@
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
+# The generated `.rspec` file contains `--require spec_helper` which will
+# cause this file to always be loaded, without a need to explicitly require it
+#  in any files.
 #
 # Given that it is always loaded, you are encouraged to keep this file as
 # light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test.rb suite on EVERY test.rb run, even for an
-# individual file that may not need all of that loaded. Instead, make a
+# will add to the boot time of your test.rb suite on EVERY test.rb run, even for
+#  an individual file that may not need all of that loaded. Instead, make a
 # separate helper file that requires this one and then use it only in the specs
 # that actually need it.
 #
@@ -14,65 +15,64 @@
 # users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test.rb failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # Enable only the newer, non-monkey-patching expect syntax.
-    # For more details, see:
-    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-    expectations.syntax = :expect
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test.rb double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Enable only the newer, non-monkey-patching expect syntax.
-    # For more details, see:
-    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-    mocks.syntax = :expect
-
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended.
-    mocks.verify_partial_doubles = true
-  end
-=end
+RSpec.configure do |_config|
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # These two settings work together to allow you to limit a spec run
+  #   # to individual examples or groups you care about by tagging them with
+  #   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  #   # get run.
+  #   config.filter_run :focus
+  #   config.run_all_when_everything_filtered = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = 'doc'
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by
+  #   # providing the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test.rb failures related to randomization by passing the same `--seed`
+  #   # value as the one that triggered the failure.
+  #   Kernel.srand config.seed
+  #
+  #   # rspec-expectations config goes here. You can use an alternate
+  #   # assertion/expectation library such as wrong or the stdlib/minitest
+  #   # assertions if you prefer.
+  #   config.expect_with :rspec do |expectations|
+  #     # Enable only the newer, non-monkey-patching expect syntax.
+  #     # For more details, see:
+  #     # - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #     expectations.syntax = :expect
+  #   end
+  #
+  #   # rspec-mocks config goes here. You can use an alternate test.rb double
+  #   # library (such as bogus or mocha) by changing the `mock_with`
+  #   # option here.
+  #   config.mock_with :rspec do |mocks|
+  #     # Enable only the newer, non-monkey-patching expect syntax.
+  #     # For more details, see:
+  #     #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #     mocks.syntax = :expect
+  #
+  #     # Prevents you from mocking or stubbing a method that does not exist on
+  #     # a real object. This is generally recommended.
+  #     mocks.verify_partial_doubles = true
+  #   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,16 +28,16 @@ dependencies:
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +188,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitreview
+- .rubocop.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -209,14 +196,18 @@ files:
 - forj.gemspec
 - forj/defaults.yaml
 - lib/appinit.rb
+- lib/boot.rb
 - lib/build_tmpl/bootstrap_build.sh
 - lib/build_tmpl/build-env.py
 - lib/build_tmpl/write-mime-multipart.py
+- lib/cloud_connection.rb
 - lib/cloud_test.rb
+- lib/destroy.rb
 - lib/forj-settings.rb
 - lib/forj/ForjCli.rb
 - lib/forj/ForjCore.rb
 - lib/forj/process/ForjProcess.rb
+- lib/get.rb
 - lib/ssh.rb
 - spec/boot_spec.rb
 - spec/down_spec.rb
@@ -259,3 +250,4 @@ test_files:
 - spec/setup_spec.rb
 - spec/spec_helper.rb
 - spec/ssh_spec.rb
+has_rdoc: