genesis_framework 0.5.3 → 0.6.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjEyOTg3NDE2MmZlZWU5N2I3MTViNDI1MWMzNTVkYTE4ZTk5MGJmZQ==
-  data.tar.gz: !binary |-
-    MTNiMGFjMzZjNTBlNjljNDMyMzIxZTY3ODEwNGY0YzhlMGE4YjNmMQ==
+SHA1:
+  metadata.gz: 72e5ea5818f16ed9e866a00db09a468bf72b086d
+  data.tar.gz: 55293b54b5ba7f13ad5ab78ba465355ecbaa66a9
 SHA512:
-  metadata.gz: !binary |-
-    ODQ2ZmY4NzM4MzI2ODVlOGU2ODc4NGY3OTJlNGJlOTIyZjAzMzZkNGIzNzA3
-    NjljOTNlNjNkOGFlNmYyNTYyMDc0NzgwM2E4MGIxYzlmYzI1MzI0NzZjYjdl
-    MTkyNmNjYmY0YmVhZWU0YTYzMTBiNjYwYzJhODZlYmJlZmJlMjE=
-  data.tar.gz: !binary |-
-    ZTU2ZmZjOTQ1ZmQyOTRhNmYzNDhkMGJjMDY5ZmI0NjkxNTg0NGIxNTU5MmRl
-    NjkwMzVlN2UyNTBmNzA5NjdkZTFkZDY4MDJiNGNjNTFlYzBjZDIwNDgzZmNj
-    NmI0MmJlN2RiNzQ5NTY1MTQ3NDk1YWE5OTQ3NjIyNzdjOWM4NmM=
+  metadata.gz: 2ff72c88bf6a0c3585f26c3bf062dad5d173b0c7f2b032ee28e35b3d40cdec404830d46fc5b8fdbe076bf5ea929f1a5d85a4c49aed3ec5dd6495c5021f2c7160
+  data.tar.gz: e8a1878de23372af3d813737de5a9568ed25d76f701c8508c0c24441270454a589c5d061d0edaa8cfb273c285fdd1bc459878abf40745e77b78356c036f1a4cf

data/lib/genesisframework/task.rb

@@ -112,32 +112,51 @@ module Genesis
               raise 'yum install exited with status: ' + $?.exitstatus.to_s
             end
           elsif provider == :gem
+            # convert arguments in "what" to a gem_name => [requires_list] structure
+            gems = {}
+            what.each { |item|
+              if item.is_a?(Hash)
+                gems.merge! item
+              else
+                gems[item] = [item]
+              end
+            }
+
             # We give a decent try at detecting if the gem is
             # installed before trying to reinstall again.
             # If it contains a - (aka you are specifying a specific version
             # or a / (aka you are specifying a path to find it) then
             # we punt on trying to determine if the gem is already
             # installed and just pass it to install anyway.
-            gems = what.select do |item|
-              item.include?("-") \
-                || item.include?("/") \
-                || Gem::Dependency.new(item).matching_specs.count == 0
+            install_gems = gems.select do |gem, requires|
+              gem.include?("-") \
+                || gem.include?("/") \
+                || Gem::Dependency.new(gem).matching_specs.count == 0
             end
-            if gems.size > 0    # make sure we still have something to do
-              Kernel.system('gem', 'install', '--no-ri', '--no-rdoc', *gems)
+
+            if install_gems.size > 0    # make sure we still have something to do
+              options = config.fetch(:gem_args, '').split
+              args = (options << install_gems.keys).flatten
+              Kernel.system('gem', 'install', *args)
               if $?.exitstatus != 0
-                raise "gem install #{gems.join(' ')} exited with status: " \
+                raise "gem install #{args.join(' ')} exited with status: " \
                   + $?.exitstatus.to_s
               end
             else                # be noisy that we aren't doing anything
-              puts "already installed gems: #{what.join(' ')}"
+              puts "already installed gems: #{gems.keys.join(' ')}"
             end
 
             # now need to clear out the Gem cache so we can load it
             Gem.clear_paths
 
-            # Now we require all the gems you asked to be installed
-            what.all? { |gem| require gem }
+            # Attempt to require loaded gems, print a message if we can't.
+            gems.each { |gem, requires|
+              begin
+                requires.each {|r| require r }
+              rescue LoadError
+                raise "Could not load gem #{gem} automatically. Maybe the gem name differs from its load path? Please specify the name to require."
+              end
+            }
           else
             raise 'Unknown install provider: ' + provider.to_s
           end

data/lib/genesisframework/tasks.rb

@@ -16,8 +16,12 @@ module Genesis
         end
       end
 
+      def self.has_block? blocks, sym
+        blocks.has_key?(sym) && blocks[sym].respond_to?(:call)
+      end
+
       def self.call_block blocks, sym, msg = nil
-        if blocks.has_key?(sym) && blocks[sym].respond_to?(:call)
+        if self.has_block? blocks, sym
           puts msg if msg
           blocks[sym].call
         else
@@ -48,7 +52,13 @@ module Genesis
       def self.execute task_name
         puts "\n#{task_name}\n================================================="
 
-        return unless Genesis::PromptCLI.ask("Would you like to run this task?", 10, true) == true
+        prompt_timeout = ENV['GENESIS_PROMPT_TIMEOUT'] \
+          || Genesis::Framework::Utils.config_cache['task_prompt_timeout'] \
+          || 10
+        if prompt_timeout.to_i > 0
+          # only prompt if there is a resonable timeout
+          return true unless Genesis::PromptCLI.ask("Would you like to run this task?", prompt_timeout, true)
+        end
 
         task = Genesis::Framework::Tasks.const_get(task_name)
 
@@ -123,7 +133,9 @@ module Genesis
           puts "task is successful!"
         else
           puts 'task failed!!!'
-          success = self.call_block(task.blocks, :rollback, "rolling back!")
+          if self.has_block? task.blocks, :rollback
+            success = self.call_block(task.blocks, :rollback, "rolling back!")
+          end
         end
 
         puts "\n\n"
@@ -133,4 +145,3 @@ module Genesis
     end
   end
 end
-

data/lib/genesisframework/utils.rb

@@ -1,4 +1,3 @@
-require 'syslog'
 require 'collins_client'
 require 'facter'
 
@@ -14,6 +13,7 @@ module Genesis
       @@config_cache = Hash.new
       @@collins_conn = nil
       @@facter = nil
+      @@loggers = nil
 
       # mimicking rail's cattr_accessor
       def self.config_cache
@@ -44,11 +44,19 @@ module Genesis
       def self.log subsystem, message
         logline = subsystem.to_s + " :: " + message
         puts logline
-        Syslog.open("genesis", Syslog::LOG_PID, Syslog::LOG_USER) unless Syslog.opened?
-        Syslog.log(Syslog::LOG_INFO, logline)
-        if self.facter['asset_tag']
-          self.collins.log! self.facter['asset_tag'], message
+
+        # Load external logging modules and send log to them
+        if @@loggers.nil?
+          @@loggers = self.config_cache[:loggers].map {|logger|
+            begin
+              require "logging/#{logger.downcase}"
+              Logging.const_get(logger.to_sym)
+            rescue LoadError
+              puts "Could not load logger #{logger}"
+            end
+          }.compact
         end
+        @@loggers.each {|logger| logger.log logline}
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genesis_framework
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Jeremy Johnstone
@@ -10,86 +10,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: genesis_promptcli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: genesis_retryingfetcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: collins_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: Genesis is a project used to manage provisioning of hardware. This is
@@ -106,7 +106,7 @@ files:
 - lib/genesisframework/task.rb
 - lib/genesisframework/tasks.rb
 - lib/genesisframework/utils.rb
-homepage: https://github.ewr01.tumblr.net/Tumblr/genesis
+homepage: https://github.com/Tumblr/genesis
 licenses:
 - Apache License, 2.0
 metadata: {}
@@ -116,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Generic server onboarding framework