forj 0.0.34 → 0.0.35

data/lib/repositories.rb

@@ -22,8 +22,8 @@ require 'require_relative'
 
 require_relative 'yaml_parse.rb'
 include YamlParse
-require_relative 'log.rb'
-include Logging
+#require_relative 'log.rb'
+#include Logging
 
 #
 # Repositories module
@@ -40,18 +40,17 @@ module Repositories
           if File.directory?(path + 'maestro')
             FileUtils.rm_r path + 'maestro'
           end
-          Logging.info('cloning the maestro repo')
           Git.clone(maestro_url, 'maestro', :path => path)
         end
       rescue => e
+        Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
         puts 'Error while cloning the repo from %s' % [maestro_url]
         puts 'If this error persist you could clone the repo manually in ~/.forj/'
-        Logging.error(e.message)
       end
       Dir.chdir(current_dir)
   end
-  
-  def create_infra
+
+  def create_infra(maestro_repo)
     home = File.expand_path('~')
     path = home + '/.forj/'
     infra = path + 'infra/'
@@ -64,9 +63,7 @@ module Repositories
     command = 'cp -rp ~/.forj/maestro/templates/infra/cloud-init ~/.forj/infra/'
     Kernel.system(command)
 
-    Dir.chdir('build_tmpl')
-
-    fill_template = 'python build-env.py -p ~/.forj/infra --maestro-path ~/.forj/maestro'
+    fill_template = 'python %s/build_tmpl/build-env.py -p ~/.forj/infra --maestro-path %s' % [$LIB_PATH, maestro_repo]
     Kernel.system(fill_template)
   end
 end

data/lib/security.rb

@@ -18,65 +18,68 @@
 require 'rubygems'
 require 'require_relative'
 
-require_relative 'connection.rb'
-include Connection
-require_relative 'log.rb'
-include Logging
-
 #
 # SecurityGroup module
 #
 module SecurityGroup
 
-  def get_or_create_security_group(name)
-    Logging.info('getting or creating security group for %s' % [name])
-    security_group = get_security_group(name)
-    if security_group == nil
-      security_group = create_security_group(name)
-    end
+  def get_or_create_security_group(oFC, name)
+    Logging.state("Searching for security group '%s'..." % [name])
+    security_group = get_security_group(oFC, name)
+    security_group = create_security_group(oFC, name) if not security_group
     security_group
   end
 
-  def create_security_group(name)
-    sec_group = nil
+  def create_security_group(oFC, name)
+    Logging.debug("creating security group '%s'" % [name])
     begin
-      sec_groups = get_security_group(name)
-      if sec_groups.length >= 1
-        sec_group = sec_groups[0]
-      else
-        description = 'Security group for blueprint %s' % [name]
-        Logging.info(description)
-        sec_group = Connection.network.security_groups.create(
+      description = "Security group for blueprint '%s'" % [name]
+      oFC.oNetwork.security_groups.create(
             :name => name,
             :description => description
         )
-      end
     rescue => e
-      Logging.error(e.message)
+      Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
     end
-    sec_group
   end
 
-  def get_security_group(name)
+  def get_security_group(oFC, name)
+    Logging.state("Searching for security group '%s'" % [name])
+    oSSLError=SSLErrorMgt.new
     begin
-      Connection.network.security_groups.all({:name => name})[0]
+      sgroups = oFC.oNetwork.security_groups.all({:name => name})
     rescue => e
-      Logging.error(e.message)
+      if not oSSLError.ErrorDetected(e.message,e.backtrace)
+         retry
+      end
+    end
+    case sgroups.length()
+      when 0
+        Logging.debug("No security group '%s' found" % [name] )
+        nil
+      when 1
+        Logging.debug("Found security group '%s'" % [sgroups[0].name])
+        sgroups[0]  
     end
   end
 
-  def delete_security_group(security_group)
+  def delete_security_group(oFC, security_group)
+    oSSLError=SSLErrorMgt.new
     begin
-      sec_group = get_security_group(security_group)
-      Connection.network.security_groups.get(sec_group.id).destroy
+      sec_group = get_security_group(oFC, security_group)
+      oFC.oNetwork.security_groups.get(sec_group.id).destroy
     rescue => e
-      Logging.error(e.message)
+      if not oSSLError.ErrorDetected(e.message,e.backtrace)
+         retry
+      end
     end
   end
 
-  def create_security_group_rule(security_group_id, protocol, port_min, port_max)
+  def create_security_group_rule(oFC, security_group_id, protocol, port_min, port_max)
+    Logging.debug("Creating ingress rule '%s:%s - %s to 0.0.0.0/0'" % [protocol, port_min, port_max])
+    oSSLError=SSLErrorMgt.new
     begin
-      Connection.network.security_group_rules.create(
+      oFC.oNetwork.security_group_rules.create(
           :security_group_id => security_group_id,
           :direction => 'ingress',
           :protocol => protocol,
@@ -85,33 +88,49 @@ module SecurityGroup
           :remote_ip_prefix => '0.0.0.0/0'
       )
     rescue StandardError => e
+      if not oSSLError.ErrorDetected(e.message,e.backtrace)
+         retry
+      end
       msg = 'error creating the rule for port %s' % [port_min]
-      puts msg
-      Logging.error(e.message)
+      Logging.error msg
     end
   end
 
-  def delete_security_group_rule(rule_id)
+  def delete_security_group_rule(oFC, rule_id)
+    oSSLError=SSLErrorMgt.new
     begin
-      Connection.network.security_group_rules.get(rule_id).destroy
+      oFC.oNetwork.security_group_rules.get(rule_id).destroy
     rescue => e
-      Logging.error(e.message)
+      if not oSSLError.ErrorDetected(e.message,e.backtrace)
+         retry
+      end
     end
   end
 
-  def get_security_group_rule(port)
+  def get_security_group_rule(oFC, security_group_id, port_min, port_max)
+    Logging.state("Searching for rule '%s - %s'" % [ port_min, port_max])
+    oSSLError = SSLErrorMgt.new
     begin
-      Connection.network.security_group_rules.all({:port_range_min => port, :port_range_max => port})[0]
-    rescue => e
-      Logging.error(e.message)
+      sgroups = oFC.oNetwork.security_group_rules.all({:port_range_min => port_min, :port_range_max => port_max, :security_group_id => security_group_id})
+      case sgroups.length()
+        when 0
+          Logging.debug("No security rule '%s - %s' found" % [ port_min, port_max ] )
+          nil
+        else
+          Logging.debug("Found security rule '%s - %s'." % [ port_min, port_max ])
+          sgroups
+      end      
+   rescue => e
+      if not oSSLError.ErrorDetected(e.message,e.backtrace)
+         retry
+      end
     end
   end
 
-  def get_or_create_rule(security_group_id, protocol, port_min, port_max)
-    Logging.info('getting or creating rule %s' % [port_min])
-    rule = get_security_group_rule(port_min)
-    if rule == nil
-      rule = create_security_group_rule(security_group_id, protocol, port_min, port_max)
+  def get_or_create_rule(oFC, security_group_id, protocol, port_min, port_max)
+    rule = get_security_group_rule(oFC, security_group_id, port_min, port_max)
+    if not rule
+      rule = create_security_group_rule(oFC, security_group_id, protocol, port_min, port_max)
     end
     rule
   end

data/lib/setup.rb

@@ -28,54 +28,92 @@ include Helpers
 # Setup module call the hpcloud functions
 #
 module Setup
-  def setup
-    # delegate the initial configuration to hpcloud (unix_cli)
-    Kernel.system('hpcloud account:setup')
-    setup_credentials
-    save_cloud_fog
-    #Kernel.system('hpcloud keypairs:add nova')
+  def setup(sProvider, oConfig, options )
+    begin
+
+      raise 'No provider specified.' if not sProvider
+
+      sAccountName = sProvider # By default, the account name uses the same provider name.
+      sAccountName = options[:account_name] if options[:account_name]
+
+      if sProvider != 'hpcloud'
+         raise "forj setup support only hpcloud. '%s' is currently not supported." % sProvider
+      end
+
+      # TODO: Support of multiple providers thanks to fog.
+      # TODO: Replace this code by our own forj account setup, inspired/derived from hpcloud account::setup
+
+      # delegate the initial configuration to hpcloud (unix_cli)
+      hpcloud_data=File.expand_path('~/.hpcloud/accounts')
+      if File.exists?(File.join(hpcloud_data, 'hp')) and not File.exists?(File.join(hpcloud_data, sAccountName)) and sAccountName != 'hp'
+         Logging.info("hpcloud: Copying 'hp' account setup to '%s'" % sAccountName)
+         Kernel.system('hpcloud account:copy hp %s' % [sAccountName])
+      end
+
+      case Kernel.system('hpcloud account:setup %s' % [sAccountName] )
+         when false
+           raise "Unable to setup your hpcloud account"
+         when nil
+           raise "Unable to execute 'hpcloud' cli. Please check hpcloud installation."
+      end
+
+      if not oConfig.yConfig['default'].has_key?('account')
+         oConfig.LocalSet('account',sAccountName)
+         oConfig.SaveConfig
+      end
+
+      # Implementation of simple credential encoding for build.sh/maestro
+      save_maestro_creds(sAccountName)
+    rescue RuntimeError => e
+      Logging.fatal(1,e.message)
+    rescue  => e
+      Logging.fatal(1,"%s\n%s" % [e.message,e.backtrace.join("\n")])
+    end
   end
 end
 
-def setup_credentials
-  hpcloud_os_user = ask('Enter hpcloud username: ')
-  hpcloud_os_key = ask('Enter hpcloud password: ') { |q| q.echo = '*'}
+def save_maestro_creds(sAccountName)
 
-  home = File.expand_path('~')
-  Helpers.create_directory('%s/.cache/forj/' % [home])
-  creds = '%s/.cache/forj/creds' % [home]
-
-  values = {:credentials => {:hpcloud_os_user=> hpcloud_os_user, :hpcloud_os_key=> hpcloud_os_key}}
+  # TODO Be able to load the previous username if the g64 file exists.
+  hpcloud_os_user = ask('Enter hpcloud username: ') do |q|
+    q.validate = /\w+/
+    q.default = ''
+  end
 
-  YamlParse.dump_values(values, creds)
+  hpcloud_os_key = ask('Enter hpcloud password: ') do |q|
+    q.echo = '*'
+    q.validate = /.+/
+  end
 
-end
+  add_creds = {:credentials => {:hpcloud_os_user=> hpcloud_os_user, :hpcloud_os_key=> hpcloud_os_key}}
 
+  sForjCache=File.expand_path('~/.cache/forj/')
+  cloud_fog = '%s/%s.g64' % [sForjCache, sAccountName]
 
-def save_cloud_fog
-  home = File.expand_path('~')
 
-  cloud_fog = '%s/.cache/forj/master.forj-13.5' % [home]
-  local_creds = '%s/.cache/forj/creds' % [home]
+  Helpers.create_directory(sForjCache) if not File.directory?(sForjCache)
 
-  creds = '%s/.hpcloud/accounts/hp' % [home]
-  template = YAML.load_file(creds)
-  local_template = YAML.load_file(local_creds)
+  # Security fix: Remove old temp file with clear password.
+  old_file = '%s/master.forj-13.5' % [sForjCache]
+  File.delete(old_file) if File.exists?(old_file)
+  old_file = '%s/creds' % [sForjCache]
+  File.delete(old_file) if File.exists?(old_file)
 
+  hpcloud_creds = File.expand_path('~/.hpcloud/accounts/%s' % [sAccountName])
+  creds = YAML.load_file(hpcloud_creds)
 
-  access_key = template[:credentials][:account_id]
-  secret_key = template[:credentials][:secret_key]
+  access_key = creds[:credentials][:account_id]
+  secret_key = creds[:credentials][:secret_key]
 
-  os_user = local_template[:credentials][:hpcloud_os_user]
-  os_key = local_template[:credentials][:hpcloud_os_key]
+  os_user = add_creds[:credentials][:hpcloud_os_user]
+  os_key = add_creds[:credentials][:hpcloud_os_key]
 
-  File.open(cloud_fog, 'w') {|file|
-    file.write('HPCLOUD_OS_USER=%s' % [os_user] + "\n")
-    file.write('HPCLOUD_OS_KEY=%s' % [os_key] + "\n")
-    file.write('DNS_KEY=%s' % [access_key] + "\n")
-    file.write('DNS_SECRET=%s' % [secret_key])
+  IO.popen('gzip -c | base64 -w0 > %s' % [cloud_fog], 'r+') {|pipe|
+    pipe.puts('HPCLOUD_OS_USER=%s' % [os_user] )
+    pipe.puts('HPCLOUD_OS_KEY=%s' % [os_key] )
+    pipe.puts('DNS_KEY=%s' % [access_key] )
+    pipe.puts('DNS_SECRET=%s' % [secret_key])
+    pipe.close_write
   }
-
-  command = 'cat  %s | gzip -c | base64 -w0 > %s.g64' % [cloud_fog, cloud_fog]
-  Kernel.system(command)
-end
+  Logging.info("'%s' written." % cloud_fog)
+end

data/lib/ssh.rb

@@ -18,8 +18,8 @@
 require 'rubygems'
 require 'require_relative'
 
-require_relative 'log.rb'
-include Logging
+#require_relative 'log.rb'
+#include Logging
 
 #
 # ssh module
@@ -40,4 +40,4 @@ module Ssh
     # connect to the server
     Kernel.system(connection)
   end
-end
+end

data/lib/yaml_parse.rb

@@ -17,8 +17,8 @@
 
 require 'rubygems'
 require 'yaml'
-require_relative 'log.rb'
-include Logging
+#require_relative 'log.rb'
+#include Logging
 
 #
 # YamlParse module
@@ -29,7 +29,7 @@ module YamlParse
       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)
+      Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
     end
   end
 
@@ -39,7 +39,7 @@ module YamlParse
         YAML.dump(string, out)
       end
     rescue => e
-      Logging.error(e.message)
+      Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
     end
   end
 end

data/spec/connection_spec.rb

@@ -20,37 +20,29 @@ require 'spec_helper'
 
 require 'fog'
 
-require_relative '../lib/connection.rb'
-include Connection
+$APP_PATH = File.dirname(__FILE__)
+$LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
+$FORJ_DATA_PATH= File.expand_path('~/.forj')
 
-class TestClass
-end
+$LOAD_PATH << './lib'
 
-describe 'network' do
-  it 'is connecting to hpcloud' do
-    @test_class = TestClass.new
-    @test_class.extend(Connection)
+require 'forj-config.rb' # Load class ForjConfig
+require 'log.rb' # Load default loggers
 
-    Fog.mock!
+include Logging
 
-    conn = @test_class.network
-    expect(conn).to be
+$FORJ_LOGGER=ForjLog.new('forj-rspec.log', Logger::FATAL)
 
-    Fog::Mock.reset
-  end
-end
+require 'connection.rb' # Load class ForjConnection
 
+describe 'Module: forj-connection' do
 
-describe 'compute' do
-  it 'is connecting to hpcloud' do
-    @test_class = TestClass.new
-    @test_class.extend(Connection)
+  it 'should connect to hpcloud (smoke test)' do
 
     Fog.mock!
-
-    conn = @test_class.compute
+    conn = ForjConnection.new(ForjConfig.new())
     expect(conn).to be
 
     Fog::Mock.reset
   end
-end
+end

data/spec/forj-config_spec.rb

@@ -15,17 +15,21 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-class TestClass
-end
-
-require_relative '../lib/forj-config.rb'
 $APP_PATH = File.dirname(__FILE__)
 $LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
 $FORJ_DATA_PATH= File.expand_path('~/.forj')
 
-describe 'forj cli' do
-  describe ".forj-config" do
-    context "new instance" do
+$LOAD_PATH << './lib'
+
+require 'forj-config.rb' # Load class ForjConfig
+require 'log.rb' # Load default loggers
+
+include Logging
+
+$FORJ_LOGGER=ForjLog.new('forj-rspec.log', Logger::FATAL)
+
+describe "class: forj-config" do
+    context "when creating a new instance" do
 
       it 'should be loaded' do
          @test_config=ForjConfig.new()
@@ -34,46 +38,46 @@ describe 'forj cli' do
 
     end
 
-    context "Config in memory" do
+    context "when starting, forj-config" do
       before(:all) do
          @config=ForjConfig.new()
       end
       
       it 'should be able to create a key/value in local config' do
-         @config.ConfigSet('test1','value')
-         @config.yConfig['default']['test1'].should == 'value'
+         @config.LocalSet('test1','value')
+         expect(@config.yConfig['default']['test1']).to eq('value')
       end
 
       it 'should be able to remove the previously created key/value from local config' do
-         @config.ConfigDel('test1')
-         @config.yConfig['default'].key?('test1').should == false
+         @config.LocalDel('test1')
+         expect(@config.yConfig['default'].key?('test1')).to equal(false)
       end
     end   
 
     
-    context "Updating local config file" do
+    context "while updating local config file, forj-config" do
       before(:all) do
          @config=ForjConfig.new() 
       end
       
       after(:all)  do
-        @config.ConfigDel('test1')
+        @config.LocalDel('test1')
         @config.SaveConfig()
       end  
 
       it 'should save a key/value in local config' do
-         @config.ConfigSet('test1','value')
-         @config.SaveConfig().should == true
+         @config.LocalSet('test1','value')
+         expect(@config.SaveConfig()).to equal(true)
       end
       
       it 'should get the saved value from local config' do
          oConfig=ForjConfig.new()
-         @config.yConfig['default']['test1'].should == 'value'
+         expect(@config.yConfig['default']['test1']).to eq('value')
       end
   
     end
 
-    context "Updating another config file from .forj" do
+    context "With another config file - test1.yaml, forj-config" do
 
       before(:all) do
         if File.exists?('~/.forj/test.yaml')
@@ -88,25 +92,26 @@ describe 'forj cli' do
         File.delete(File.expand_path('~/.forj/test1.yaml'))
       end  
 
-      it 'If file do not exist, warning! and file is not created.' do
-         File.exists?(File.expand_path('~/.forj/test.yaml')).should == false
+      it 'won\'t create a new file If we request to load \'test.yaml\'' do
+         expect(File.exists?(File.expand_path('~/.forj/test.yaml'))).to equal(false)
       end
       
-      it 'Then, default config is loaded.' do
-         File.basename(@config.sConfigName).should == 'config.yaml'
+      it 'will load the default config file if we request to load \'test.yaml\'' do
+         expect(File.basename(@config.sConfigName)).to eq('config.yaml')
       end
 
-      it 'test1.yaml config is loaded.' do
-         File.basename(@config2.sConfigName).should == 'test1.yaml'
+      it 'will confirm \'test1.yaml\' config to be loaded.' do
+         expect(File.basename(@config2.sConfigName)).to eq('test1.yaml')
       end
 
-      it 'should save a key/value in test2 config' do
-         @config2.ConfigSet('test2','value')
-         @config2.SaveConfig().should == true
+      it 'can save \'test2=value\'' do
+         @config2.LocalSet('test2','value')
+         expect(@config2.SaveConfig()).to equal(true)
+         config3=ForjConfig.new('test1.yaml')
+         expect(config3.yConfig['default']['test2']).to eq('value')
       end
 
   
     end
-  end
 
 end

data/spec/repositories_spec.rb

@@ -18,6 +18,7 @@
 require 'rubygems'
 require 'spec_helper'
 
+require 'ansi'
 require 'fog'
 
 require_relative '../lib/repositories.rb'
@@ -31,7 +32,7 @@ describe 'repositories' do
     @test_class = TestClass.new
     @test_class.extend(Repositories)
 
-    repo = @test_class.clone_repo('https://github.com/forj-oss/maestro')
+    repo = @test_class.clone_repo('https://github.com/forj-oss/cli')
     expect(repo).to be
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - forj team
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.21
+- !ruby/object:Gem::Dependency
+  name: ansi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
 description: forj command line
 email:
 - forj@forj.io