ronin-wrapper 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88b9195eccbb175d71c438d5c13a301bc2298b10
-  data.tar.gz: f4c9bcc055b2ed4d0a427be7366383b5ab97acd7
+  metadata.gz: 53e2dbec8e427757f3f6aa4dd83f44da312e738a
+  data.tar.gz: d9826525467d51515bd6e17b84a7a4d3f0f02fa9
 SHA512:
-  metadata.gz: fc556846b57c8f12b7a85db8d61e88b38fef110061275aeb6994adda463a6949a15e4a893dbdf551f05fe9c638c550d5bdef254f08d448e069c6348561c47f3f
-  data.tar.gz: ac93b7ff639ace8b89c0468b2e5dd97a5d33476569038b185d5c28c80313138504a0a2f51a4f1a5c254bce019cec5feead4e6fbb5f3884600a94374e19809142
+  metadata.gz: 3caca00937edd64378164774cac21fa6ffe5f21577a9f69960fdabff2ae180ab14d3ac4006ed0b5d6e693f9b96da786d85ea5f2b459d0226315383b62152d6be
+  data.tar.gz: 2144ce58a9df7fea7f7d68819660bef0e7a3d9dfc0f54789b26b0a9edc930a452ef43b55aac3060075a019f6e8e08b353a43af15439452e7b1c01e54f5102924

data/lib/ronin/artifact_runner.rb

@@ -28,8 +28,9 @@ module Ronin
     end
 
     def download_and_report_changes
-      Parallel.each(@run_list.items, :in_processes => Ronin::Util.num_cores) do |item|
-         @actual_branch = Ronin::Git.branch(item[:name])
+      @items = @run_list.items
+      Parallel.each(@items, :in_threads => Ronin::Util.num_cores) do |item|
+        @actual_branch = Ronin::Git.branch(item[:name])
 
         if File.exist?("#{Ronin::Config[:artifact_path]}/#{item[:name]}")
           if item[:branch] != 'master'

data/lib/ronin/chef.rb

@@ -19,17 +19,18 @@ require 'ronin/log'
 require 'json'
 
 module Ronin
-  module Chef
-    @run_list  = "#{Ronin::Config[:artifact_path]}/ronin.json"
-    @solo_conf = "#{Ronin::Config[:artifact_path]}/ronin-chef-solo.rb"
-    @recipes   = Ronin::RunList.new.artifacts
+  class Chef
+
+    def initialize
+      @run_list  = "#{Ronin::Config[:artifact_path]}/ronin.json"
+      @solo_conf = "#{Ronin::Config[:artifact_path]}/ronin-chef-solo.rb"
+      @recipes   = Ronin::RunList.new.artifacts
+    end
 
     def create_run_list
       Ronin::Log.info("Building Chef run list at #{@run_list}.")
-
       @rl = []
       @rl_obj = {}
-
       @recipes.each do |r|
         @rl << "recipe[#{r}]"
         Ronin::Log.info("Adding recipe '#{r}' to run list.")
@@ -41,7 +42,6 @@ module Ronin
         f.write(@rl_obj.to_json)
       end
     end
-    module_function :create_run_list
 
     def run
       self.create_run_list
@@ -51,7 +51,6 @@ module Ronin
       @cmd.run_command
       self.clean_up
     end
-    module_function :run
 
     def create_solo_conf
       @solo_config = "file_cache_path '/var/tmp/ronin/chef-solo'\ncookbook_path '#{Ronin::Config[:artifact_path]}'\n"
@@ -60,7 +59,6 @@ module Ronin
         f.write(@solo_config)
       end
     end
-    module_function :create_solo_conf
 
     def clean_up
       Ronin::Log.info("Cleaning up Chef run list at #{@run_list}.")
@@ -69,6 +67,6 @@ module Ronin
       Ronin::Log.info("Cleaning up Chef-Solo config at #{@solo_conf}.")
       File.delete(@solo_conf)
     end
-    module_function :clean_up
+
   end
 end

data/lib/ronin/config.rb

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 require 'mixlib/config'
+require 'ronin/etcd'
 
 module Ronin
   class Config
@@ -27,19 +28,25 @@ module Ronin
       puts "No configuration file at #{config_file}, using defaults."
     end
 
-    config_strict_mode         true
-    default :lock_file,        '/var/tmp/ronin.lock'
-    default :log_path,         '/var/log/ronin'
-    default :log_level,        :info
-    default :update_on_change, true
-    default :interpreter,      :puppet
-    default :artifact_path,    '/var/lib/ronin/artifacts'
-    default :run_list_type,    :yaml
-    default :run_list_file,    '/etc/ronin/artifacts.yaml'
-    default :etcd_host,        '127.0.0.1'
-    default :etcd_port,        4001
+    config_strict_mode          true
+    default :config_from_etcd,  false
+    default :lock_file,         '/var/tmp/ronin.lock'
+    default :log_path,          '/var/log/ronin'
+    default :log_level,         :info
+    default :update_on_change,  true
+    default :interpreter,       'chef'
+    default :artifact_path,     '/var/lib/ronin/artifacts'
+    default :run_list_type,     'yaml'
+    default :run_list_file,     '/etc/ronin/artifacts.yaml'
+    default :etcd_host,         '127.0.0.1'
+    default :etcd_port,         4001
+    default :etcd_conn_timeout, 5
+    default :etcd_read_timeout, 5
+    default :etcd_use_ssl,      false
+    default :etcd_ssl_ca_cert,  ''
+    default :etcd_ssl_cert,     ''
+    default :etcd_ssl_key,      ''
+    default :etcd_keys,          [ 'common', 'env', 'node' ]
 
   end
-end
-
-
+end

data/lib/ronin/etcd.rb

@@ -20,25 +20,67 @@ require 'socket'
 require 'json'
 
 # Add test data thus.
-#curl -L http://127.0.0.1:4001/v2/keys/ronin/run_lists/localhost.localdomain -X PUT -d value='{
-# "run_list": [
+
+#curl -L http://127.0.0.1:4001/v2/keys/ronin/config/common -X PUT -d value='{
+# "artifacts": [
 #   "https://github.com/opscode-cookbooks/motd-tail"
 #  ]
 #}'
 
+#curl -L http://127.0.0.1:4001/v2/keys/ronin/config/common -X PUT -d value='{
+#  "log_path": "/var/log/ronin",
+#  "interpreter": ":chef",
+#  "artifact_path": "/var/lib/ronin/artifacts",
+#  "update_on_change": "true",
+#  "run_list_type": ":etcd",
+#  "run_list_file": "/etc/ronin/artifacts.yaml"
+#}'
+
 module Ronin
   module Etcd
-    def get_run_list
+
+    def get_key(type, key)
       # Will add error handling... one day.
-      @hostname = Socket.gethostname
-      @path = "/v2/keys/ronin/run_lists/#{@hostname}"
-      @http = Net::HTTP.new(Ronin::Config['etcd_host'], Ronin::Config['etcd_port'])
-      @http.use_ssl = false
+      @path = "/v2/keys/ronin/#{type}/#{key}"
+      @http = Net::HTTP.new(Ronin::Config[:etcd_host], Ronin::Config[:etcd_port])
+      @http.read_timeout = Ronin::Config[:etcd_read_timeout]
+      @http.open_timeout = Ronin::Config[:etcd_conn_timeout]
+
+      if Ronin::Config[:etcd_use_ssl]
+        @http.use_ssl = true
+        unless Ronin::Config[:etcd_ssl_cert] = ''
+          @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          store = OpenSSL::X509::Store.new
+          store.add_cert(OpenSSL::X509::Certificate.new(File.read(Ronin::Config[:etcd_ssl_ca_cert])))
+          @http.cert_store = store
+          @http.key = OpenSSL::PKey::RSA.new(File.read(Ronin::Config[:etcd_ssl_cert]))
+          @http.cert = OpenSSL::X509::Certificate.new(File.read(Ronin::Config[:etcd_ssl_key]))
+        end
+      else
+        @http.use_ssl = false
+      end
+
       @request = Net::HTTP::Get.new(@path)
       @result = @http.request(@request)
-      @raw = JSON.parse(@result.body)['node']['value']
-      return JSON.parse(@raw)['run_list']
+      return JSON.parse(@result.body)['node']['value']
+    end
+    module_function :get_key
+
+    def get_config
+      @hostname = Socket.gethostname
+      @common   = JSON.parse(Ronin::Etcd.get_key('config', 'common'))
+      #@specific = JSON.parse(Ronin::Etcd.get_key('config', @hostname))
+      #return @common.merge(@specific)
+    end
+    module_function :get_config
+
+    def get_run_list
+      @hostname = Socket.gethostname
+      @common   = JSON.parse(Ronin::Etcd.get_key('run_list', 'common'))['artifacts']
+      #@specific = JSON.parse(Ronin::Etcd.get_key('run_list', @hostname))['artifacts']
+      #return (@common+@specific).uniq
     end
     module_function :get_run_list
+
   end
 end

data/lib/ronin/puppet.rb

@@ -18,10 +18,12 @@ require 'ronin/config'
 require 'ronin/log'
 
 module Ronin
-  module Puppet
+  class Puppet
 
-    @run_list = "#{Ronin::Config[:artifact_path]}/ronin.pp"
-    @modules = Ronin::RunList.new.artifacts
+    def initialize
+      @run_list = "#{Ronin::Config[:artifact_path]}/ronin.pp"
+      @modules = Ronin::RunList.new.artifacts
+    end
 
     def create_run_list
       Ronin::Log.info("Building Puppet run list at #{@run_list}.")
@@ -32,7 +34,6 @@ module Ronin
         end
       end
     end
-    module_function :create_run_list
 
     def run
       self.create_run_list
@@ -41,12 +42,11 @@ module Ronin
       @cmd.run_command
       self.clean_up
     end
-    module_function :run
 
     def clean_up
       Ronin::Log.info("Cleaning up Puppet run list at #{@run_list}.")
       File.delete(@run_list)
     end
-    module_function :clean_up
+
   end
 end

data/lib/ronin/ronin.rb

@@ -23,6 +23,20 @@ require 'ronin/log'
 module Ronin
   def run
 
+    if Ronin::Config[:config_from_etcd] == true
+      Ronin::Log.info("Pulling configuration items from etcd (#{Ronin::Config[:etcd_host]}:#{Ronin::Config[:etcd_port]}).")
+
+      Ronin::Etcd.get_config.each do |k, v|
+        Ronin::Log.info("Setting #{k} to #{v}.")
+
+        if v.start_with?(':')
+         v = v[1..-1].to_sym
+        end
+
+        Ronin::Config["#{k}"] = v
+      end
+    end
+
     Ronin::Log.level = Ronin::Config[:log_level]
 
     if Ronin::Util.find_cmd("git").nil?
@@ -40,23 +54,27 @@ module Ronin
     if Ronin::Util.find_cmd("chef-solo").nil? and Ronin::Config[:interpreter] == :puppet
       abort("You need to have Chef-Solo installed to perform this command with Chef set as the interpreter.")
     else
-      $CHEFSOLO_BIN = Ronin::Util.find_cmd("puppet")
+      $CHEFSOLO_BIN = Ronin::Util.find_cmd("chef-solo")
     end
 
     unless File.exists?(Ronin::Config[:lock_file])
       Ronin::Log.info("Dropping lock file. (#{Ronin::Config[:lock_file]})")
       File.new(Ronin::Config[:lock_file], "w")
 
-      @r = Ronin::ArtifactRunner.new
-      @changes = @r.download_and_report_changes
-      @r.purge_unused
+      r = Ronin::ArtifactRunner.new
+      changes = r.download_and_report_changes
+      r.purge_unused
 
-      if @changes
-        if Ronin::Config[:interpreter] == :puppet
-          Ronin::Puppet.run
-        elsif Ronin::Config[:interpreter] == :chef
-          Ronin::Chef.run
+      if changes
+        if Ronin::Config[:interpreter] == 'puppet'
+          runner = Ronin::Puppet.new
+          runner.run
+        elsif Ronin::Config[:interpreter] == 'chef'
+          runner = Ronin::Chef.new
+          runner.run
         end
+      else
+        Ronin::Log.info("No changes detected, not running interpretor.")
       end
       Ronin::Log.info("Deleting lock file and exiting. (#{Ronin::Config[:lock_file]})")
       File.delete(Ronin::Config[:lock_file])

data/lib/ronin/run_list.rb

@@ -23,24 +23,28 @@ module Ronin
 
     def initialize
       @run_list = {}
-      if Ronin::Config[:run_list_type] == :yaml
-         @artifacts_raw = YAML.load_file(Ronin::Config['run_list_file'])['artifacts']
-      elsif Ronin::Config[:run_list_type] == :etcd
-         @artifacts_raw = Ronin::Etcd.get_run_list
+
+      if Ronin::Config[:run_list_type] == 'etcd'
+        @artifacts_raw = Ronin::Etcd.get_run_list
+      else
+        @artifacts_raw = YAML.load_file(Ronin::Config['run_list_file'])['artifacts']
       end
 
-      @artifacts_raw.each do |a|
-        if a.include?(";")
-          @repo   = a.split(";")[0].sub(/(\/)+$/,'')
-          @branch = a.split(";")[1]
-        else
-          @repo   = a
-          @branch = 'master'
-        end
+      unless @artifacts_raw.nil?
 
-        @name = @repo.split("/").last
+        @artifacts_raw.each do |a|
+          if a.include?(";")
+            @repo   = a.split(";")[0].sub(/(\/)+$/,'')
+            @branch = a.split(";")[1]
+          else
+            @repo   = a
+            @branch = 'master'
+          end
 
-        @run_list[@name] = { :name => @name, :repo => @repo, :branch => @branch }
+          @name = @repo.split("/").last
+
+          @run_list[@name] = { :name => @name, :repo => @repo, :branch => @branch }
+        end
       end
 
       @run_list

data/lib/ronin/version.rb

@@ -14,5 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 module Ronin
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ronin-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Nathan Milford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby