hazetug 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebdf9a9772962644f814c2215eb1a788e935a317
-  data.tar.gz: 5886036f41c10cc8a7efb87dbce4a3bc21c20d31
+  metadata.gz: a6c00796640e6ece747e594b00ba9920a6eb274c
+  data.tar.gz: b4547334fbbf7886ec879ec28973741eda037ae0
 SHA512:
-  metadata.gz: fbf02d130984ad264c559f943be0b146e84a92ab5999d0390eafab9ff03de631cadf5cf367856c4d1fbb484bb0c547700ece2b5d8c2eeb81706002207acbd5fe
-  data.tar.gz: 5ba4e8ff097d31ec9d3e5685ce3a0bf9c6a8165e65bdb45ecef0f6dc1deb92dd46430e0af17e89bcf1e5bc8ed9e3dddb459570279d2e533f4eeab3fda1e825af
+  metadata.gz: c2fb703a1956871aae50be4bc4e4d4c8482b1dca282a01b6693f157f01c8eae04194d95d3a0b829aaa3c590d9ca24cd7ac905325ce2e17880389b136393da865
+  data.tar.gz: 6cde17df0db9ceafc66365aaaec3872a8d03f90f9c17323b1a1198b64433c23559659f1af2c3500e8b126f1807e7a03893ae4f48b9dde163bbd39ef4950f378f

data/README.md

@@ -97,7 +97,7 @@ Hazetug uses [fog cloud library](http://fog.io) to be able to easily append othe
         <td><b>Default value</b></td>
     </tr>
     <tr>
-        <td><b><i>attributes_json</i></b></td>
+        <td><b><i>attributes</i></b></td>
         <td>Hash of attributes prepared for chef-solo run. (It's merged with the run_list).</td>
         <td><i>{}</i><td>
     </tr>
@@ -217,7 +217,6 @@ bootstrap:
       }
     }
 ```
-```
 
 Merged *attributes* with the *run_list* form the input data for running **chef-solo** they are available inside bootstrap.erb as `hazetug[:attributes_json]`. Berksfile can be set specifically  in the bootstrap task list or if it's not set local *Berksfile* is tried by default.
 

data/hazetug.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", "~> 0"
-  spec.add_dependency "psych", "~> 0"
-  spec.add_dependency "fog", "~> 0"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "psych", "~> 2.0"
+  spec.add_dependency "fog", "~> 1.0"
   spec.add_dependency "chef", "~> 11.0"
   spec.add_dependency "gli",  "~> 2.0"
-  spec.add_dependency "agent", "~> 0"
+  spec.add_dependency "agent", "~> 0.0"
   spec.add_dependency "berkshelf", "~> 3.0"
 end

data/lib/hazetug/cli/bootstrap.rb

@@ -25,8 +25,9 @@ class Hazetug
 
       def provision_and_bootstrap(haze, tug, channel, waitgroup)
         haze.provision
+
         if haze.ready?
-          tug.load_haze_config(haze.config_for_tug)
+          haze.update_access_settings tug.config
 
           tug.bootstrap({
             args:  data[:args],
@@ -36,7 +37,7 @@ class Hazetug
         end
       rescue
         # Exeception will be lost, since we run inside goproc,
-        # ie. as soon as waitgroup is empty all process exit.
+        # ie. as soon as waitgroup is empty and all processes died.
         puts $!.inspect
         puts $@
       ensure

data/lib/hazetug/haze.rb

@@ -2,14 +2,17 @@ require 'hazetug/config'
 require 'hazetug/compute'
 require 'hazetug/ui'
 require 'hazetug/tug'
+require 'hazetug/net_ssh'
 require 'chef/mash'
 
 class Hazetug
   class Haze
     include Hazetug::UI::Mixin
+    include Hazetug::NetSSH::Mixin
+
+    attr_reader :config, :compute_name
 
     RE_BITS  = /-?x(32)$|-?x(64)$|(32)bit|(64)bit/i
-    attr_reader :config, :compute, :compute_name, :server
 
     def initialize(config={})
       @compute_name = Hazetug.leaf_klass_name(self.class)
@@ -23,8 +26,12 @@ class Hazetug
       provision_server
       wait_for_ssh
     rescue Fog::Errors::Error
+      # Catch fog errors, don't abort further execution
+      ui.error "[#{compute_name}] #{$!.inspect}"
+    rescue
+      # For unknown exceptions, notify and exit
       ui.error "[#{compute_name}] #{$!.inspect}"
-      ui.msg   $@
+      ui.msg $@
       exit(1)
     end
 
@@ -32,31 +39,32 @@ class Hazetug
       @ready
     end
 
-    def configure(config)
-      input = config.keys.map(&:to_sym)
-      requires = self.class.requires
-      unless (norequired = requires.select {|r| not input.include?(r)}).empty?
-        ui.error "Required options missing: #{norequired.join(', ')}"
-        raise ArgumentError, "Haze options missing"
+    def public_ip_address
+    end
+
+    def private_ip_address
+    end
+
+    # Update hash with haze access settings only if any available
+    def update_access_settings(hash)
+      {
+        compute_name: compute_name.downcase,
+        public_ip_address: (public_ip_address || 
+            (server and server.ssh_ip_address)),
+        private_ip_address: private_ip_address
+      }.inject(hash) do |hsh, (k, v)|
+        hsh[k] = v if v
+        hsh
       end
-      Mash.new(self.class.defaults.merge(config))
     end
 
     class << self
       def requires(*args)
-        if args.empty?
-          @requires
-        else
-          @requires = args.flatten.dup
-        end
+        args.empty? ? @requires : @requires = args.flatten.dup
       end
 
       def defaults(hash=nil)
-        if hash.nil?
-          @defaults
-        else
-          @defaults = hash
-        end
+        hash.nil? ? @defaults : @defaults = hash
       end
 
       def [](haze_name)
@@ -65,21 +73,9 @@ class Hazetug
       end
     end
 
-    def public_ip_address
-    end
-
-    def private_ip_address
-    end
-
-    def config_for_tug
-      {
-        compute_name: compute_name.downcase,
-        public_ip_address: (public_ip_address || server.ssh_ip_address rescue nil),
-        private_ip_address: private_ip_address
-      }
-    end
-
     protected
+    attr_accessor :server
+    attr_reader   :compute
 
     def provision_server
       ui.error "#{compute_name} Provisioning is not impemented"
@@ -89,5 +85,19 @@ class Hazetug
       ui.error "#{compute_name} Waiting for shh is not impemented"
     end
 
+    private
+
+    def configure(config)
+      input = config.keys.map(&:to_sym)
+      requires = self.class.requires
+
+      unless (norequired = requires.select {|r| not input.include?(r)}).empty?
+        ui.error "Required options missing: #{norequired.join(', ')}"
+        raise ArgumentError, "Haze options missing"
+      end
+
+      Mash.new(self.class.defaults.merge(config))
+    end
+
   end
 end

data/lib/hazetug/haze/cloud_server.rb

@@ -4,20 +4,16 @@ class Hazetug
 
       def provision_server
         ui.info "[#{compute_name}] creating server #{config[:name]}"
-        @server = compute.servers.create(server_args)
+        self.server = compute.servers.create(server_args)
         server.wait_for { ready? }
         ui.info "[#{compute_name}] server #{config[:name]} created, ip: #{server.ssh_ip_address}"
       end
 
       def wait_for_ssh
-        ssh_options = {}
-        ssh_opts = Hazetug::Tug.ssh_options_from(config)
-        ssh_options[:password] = ssh_opts[:ssh_password]
-        ssh_options[:paranoid] = ssh_opts[:host_key_verify] || false
-        ssh_options[:keys] = ssh_opts[:ssh_keys] || Hazetug.ssh_keys(compute_name)
-        server.username = ssh_opts[:ssh_user] || 'root'
-        server.ssh_port = ssh_opts[:ssh_port]
-        server.ssh_options = ssh_options
+        server.username = config[:ssh_user] || 'root'
+        server.ssh_port = config[:ssh_port]
+        server.ssh_options = net_ssh_options
+
         ui.info "[#{compute_name}] waiting for active ssh on #{server.ssh_ip_address}"
         server.wait_for(30) { sshable? }
         @ready = true

data/lib/hazetug/hazetug.rb

@@ -20,12 +20,5 @@ class Hazetug
         klass.name.split('::').last
       end
     end
-
-    def ssh_keys(compute_name=nil)
-      ssh_attr = []
-      ssh_attr << "#{compute_name.downcase}_ssh_keys" if compute_name
-      ssh_attr << "ssh_keys"
-      Hazetug::Config[ssh_attr.find {|a| Hazetug::Config[a]}]
-    end
   end
 end

data/lib/hazetug/net_ssh.rb

@@ -0,0 +1,40 @@
+class Hazetug
+  module NetSSH
+
+    module Mixin
+      NET_SSH_OPTIONS = [
+        :ssh_password, :ssh_port, :ssh_host_key_verify, :ssh_keys ]
+
+      private
+
+      def net_ssh_options
+        @net_ssh_options ||= begin
+          hash = {}
+          ssh_opts = pick_ssh_options
+          hash[:password] = ssh_opts[:ssh_password]
+          hash[:paranoid] = ssh_opts[:host_key_verify] || false
+          hash[:keys] = ssh_opts[:ssh_keys] || NetSSH.ssh_keys(config[:compute_name])
+          hash[:port] = ssh_opts[:ssh_port]
+          hash
+        end
+      end
+
+      def pick_ssh_options
+        NET_SSH_OPTIONS.inject({}) do |hash, k|
+          if value = (config[k])
+            hash[k] = value
+          end
+          hash
+        end
+      end
+    end
+
+    def self.ssh_keys(compute_name=nil)
+      ssh_attr = []
+      ssh_attr << "#{compute_name.downcase}_ssh_keys" if compute_name
+      ssh_attr << "ssh_keys"
+      Hazetug::Config[ssh_attr.find {|a| Hazetug::Config[a]}]
+    end
+
+  end
+end

data/lib/hazetug/tug.rb

@@ -1,20 +1,18 @@
 require 'hazetug/tug/knife'
 require 'hazetug/tug/solo'
 require 'hazetug/ui'
+require 'hazetug/net_ssh'
 require 'chef/mash'
 
 class Hazetug
   class Tug
     include Hazetug::UI::Mixin
-
-    SSH_OPTIONS = [
-      :ssh_user, :ssh_password, :ssh_port,
-      :ssh_host_key_verify, :ssh_keys
-    ]
-    LOGDIR = "#{Dir.pwd}/logs"
+    include Hazetug::NetSSH::Mixin
 
     attr_reader :config, :options
 
+    LOGDIR = "#{Dir.pwd}/logs"
+
     def initialize(config={})
       @config = config
     end
@@ -28,35 +26,25 @@ class Hazetug
       ip = config[:public_ip_address]
 
       ui.msg "[#{tug_name}] bootstraping server #{config[:name]}, ip: #{ip}"
+
       exit_status = bootstrap_server
 
       if exit_status.is_a?(Fixnum) && exit_status != 0
         ui.error "[#{tug_name}] bootstraping server #{config[:name]} failed."
       else
+
         ui.msg "[#{tug_name}] bootstraping server #{config[:name]} done."
       end
+
     rescue Hazetug::Exception => e
       ui.error "[#{config[:compute_name]}] #{e.message}"
     end
 
-    def load_haze_config(hash)
-      @config.merge!(hash)
-    end
-
     class << self
       def [](symbol_or_string)
         klass = Hazetug.camel_case_name(symbol_or_string)
         const_get(klass)
       end
-
-      def ssh_options_from(config)
-        SSH_OPTIONS.inject({}) do |hash, k|
-          if value = (config[k])
-            hash[k] = value
-          end
-          hash
-        end
-      end
     end
 
     protected

data/lib/hazetug/tug/knife.rb

@@ -8,18 +8,13 @@ class Hazetug
 
       def initialize(config={}, haze=nil)
         super
-        @chef_option_list = [
-          :environment,
-          :chef_server_url,
+        [ :chef_server_url,
           :validation_key
-        ]
+        ].inject(@chef_option_list, :<<)
       end
 
       def bootstrap_config
         super
-        @chef_option_list.each do |opt|
-          Chef::Config[opt] = bootstrap_options[opt]
-        end
         check_bootstrap_files! :validation_key, :template_file
       end
 

data/lib/hazetug/tug/knife_base.rb

@@ -55,6 +55,7 @@ class Hazetug
           :ssh_password,
           :host_key_verify
         ]
+        @chef_option_list = [ :environment ]
       end
 
       # Bootstraps the remote server using knife bootstrap.
@@ -78,6 +79,10 @@ class Hazetug
           knife.config[opt] = bootstrap_options[opt]
         end
 
+        @chef_option_list.each do |opt|
+          Chef::Config[opt] = bootstrap_options[opt]
+        end
+
         # Check ssh identity
         cred = [
           hazetug_identity, bootstrap_options[:identity_file],

data/lib/hazetug/tug/solo.rb

@@ -27,7 +27,7 @@ class Hazetug
       end
 
       def bootstrap_cleanup
-        ssh = Fog::SSH.new(config[:public_ip_address], ssh_username, ssh_options)
+        ssh = Fog::SSH.new(config[:public_ip_address], ssh_username, net_ssh_options)
         ssh.run("test -f #{@upload_dest} && rm #{@upload_dest}")
       end
 
@@ -46,7 +46,7 @@ class Hazetug
 
       def upload_berks_package
         berks_package do |path|
-          scp = Fog::SCP.new(config[:public_ip_address], ssh_username, ssh_options)
+          scp = Fog::SCP.new(config[:public_ip_address], ssh_username, net_ssh_options)
           scp.upload(path, @upload_dest)
         end
       end
@@ -67,20 +67,6 @@ class Hazetug
         end
       end
 
-      private
-
-      def ssh_options
-        @ssh_options ||= begin
-          ssh_options = {}
-          ssh_opts = Hazetug::Tug.ssh_options_from(config)
-          ssh_options[:password] = ssh_opts[:ssh_password]
-          ssh_options[:paranoid] = ssh_opts[:host_key_verify] || false
-          ssh_options[:keys] = ssh_opts[:ssh_keys] || Hazetug.ssh_keys(config[:compute_name])
-          ssh_options[:port] = ssh_opts[:ssh_port]
-          ssh_options
-        end
-      end
-
       def ssh_username
         config[:ssh_user] || 'root'
       end

data/lib/hazetug/version.rb

@@ -1,3 +1,3 @@
 class Hazetug
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hazetug
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Denis Barishev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,7 @@ files:
 - lib/hazetug/haze/digital_ocean.rb
 - lib/hazetug/haze/linode.rb
 - lib/hazetug/hazetug.rb
+- lib/hazetug/net_ssh.rb
 - lib/hazetug/task.rb
 - lib/hazetug/tug.rb
 - lib/hazetug/tug/knife.rb