spaux 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ca6cdb0701d57bb9e1e6757409f445751a7be00
-  data.tar.gz: ebc351a25943fb1ac5a927d6ef349404dd9eb3cf
+  metadata.gz: 98ef4d4b5b2c48f5bc4eb185a96c9ae636653482
+  data.tar.gz: cfd56cada6b0dc2cc3f082add195dfe014c7380a
 SHA512:
-  metadata.gz: 49a94afda451ae1327d989492ccf24f26e8b7edd2798f2f6e97b13332b0688f02f260ac4089f8678a705866a22597871237a761312cbd7045b2b924a1de12b86
-  data.tar.gz: c01509c2736bd400bb0c878f967b67468ebac7995ca09f3419232bfa0f1c4b335c2eb0dba58d2cea3da37dc156e2250e01782e3815513441f5fe16526f053c68
+  metadata.gz: 312b7fdb2479fdd59c6de22b2aab1ebe1b1aec0aae5edfd3bf7066ddfe54b9d1eea7317981d6e0804e1e8a0d70029ea96993288fec0d9caa40f74786d24c9a4d
+  data.tar.gz: bb268b6677d3403d947ae482efaa6d345b42b05b18dc7fa5d2a28e4159eaf6966e1501c75aeafba67b2ca6ba4b3b0ce05d2ccba6056b2fb25b84143042f8e918

data/lib/spaux/chef/client.rb

@@ -1,5 +1,5 @@
 require 'spaux/chef/key'
-require 'spaux/chef/monkey_patches'
+require 'spaux/chef/monkey_patches/client'
 
 class Spaux
   class Chef
@@ -7,27 +7,19 @@ class Spaux
       attr_accessor :work_dir
       attr_accessor :spaux_config
 
-      DEFAULT_CHEF_CONFIG = {
-        config_file:      ::File.join('@work_dir', 'client.rb'),
-        cache_path:       ::File.join('@work_dir', '.chef'),
-        client_key:       ::File.join('@work_dir', 'client.pem'),
-        json_attribs:     ::File.join('@work_dir', 'attributes.json'),
-        chef_server_url:  'https://api.opscode.com/organizations/spaux',
-        ssl_verify_mode:  :verify_peer,
-        node_name:        'spaux',
-        override_runlist: ["recipe[spaux::machine]"]
-      }
-
       def initialize(work_dir, *args)
         @work_dir = work_dir
         chef_config = args.shift  || {}
         spaux_config = args.shift || {}
         super()
 
-        DEFAULT_CHEF_CONFIG.each { |_,v| v.is_a?(String) && v.gsub!(/@work_dir/, @work_dir) }
-        @config.merge! DEFAULT_CHEF_CONFIG.merge(chef_config)
+        default_chef_config = Spaux::default_chef_config(:client)
+
+        default_chef_config.each { |_,v| v.is_a?(String) && v.gsub!(/@work_dir/, @work_dir) }
+        @config.merge! default_chef_config.merge(chef_config)
+
+        default_spaux_config = Spaux::default_spaux_config
 
-        default_spaux_config = Spaux::Chef::Key::DEFAULT_SPAUX_CONFIG
         @spaux_config = default_spaux_config.merge(spaux_config)
         #if !@spaux_config.eql?(default_spaux_config)
           #trigger a reevalutation of the private key

data/lib/spaux/chef/default/client.rb

@@ -0,0 +1,8 @@
+config_file      ::File.join('@work_dir', 'client.rb')
+cache_path       ::File.join('@work_dir', '.chef')
+client_key       ::File.join('@work_dir', 'client.pem')
+json_attribs     ::File.join('@work_dir', 'attributes.json')
+chef_server_url  'https://api.opscode.com/organizations/spaux'
+ssl_verify_mode  :verify_peer
+node_name        'spaux'
+override_runlist ["recipe[spaux::machine]"]

data/lib/spaux/chef/key.rb

@@ -8,20 +8,19 @@ class Spaux
       attr_accessor :raw_key
       attr_accessor :config
 
-      DEFAULT_SPAUX_CONFIG = {
-        chef_private_key_gist_id: '16b65a73953427ce9c40',
-        private_key:              '~/.ssh/id_rsa',
-        aes_key_size:             256,
-        aes_cipher_mode:          :CBC
-      }
-
       def initialize(config={})
         @work_dir = ::File.join(ENV['PWD'], 'current')
-        @config = config.merge(DEFAULT_SPAUX_CONFIG)
+        @config = config.merge(default_spaux_config)
         @raw_key ||= get_raw_key
       end
 
       private
+      # this is wrong, this should in Spaux class
+      def default_spaux_config
+        spaux_dir = ::File.expand_path(::File::join(__FILE__, '..', '..'))
+        config_file = ::File.join(spaux_dir, 'config.rb')
+        configuration = eval(::File.read(config_file))
+      end
       def get_raw_key
         key_filename = 'encrypted.rb'
         key_file = ::File.join(@work_dir, key_filename)

data/lib/spaux/chef/knife.rb

@@ -1,6 +1,6 @@
 require 'chef/application/knife'
 require 'fileutils'
-require 'spaux/chef/knife_monkey_patches'
+require 'spaux/chef/monkey_patches/knife'
 
 class Spaux
   class Chef

data/lib/spaux/chef/{knife_monkey_patches.rb → monkey_patches/knife.rb}

@@ -1,7 +1,7 @@
 class Chef
   class Knife
    def configure_spaux
-     config.merge!(Spaux::default_knife_config)
+     config.merge!(Spaux::default_chef_config(:knife))
    end
    def self.run(args, options={})
       # Fallback debug logging. Normally the logger isn't configured until we

data/lib/spaux/cli.rb

@@ -10,16 +10,7 @@ class Spaux
     option :current, :type => :boolean, :default => true,
       :desc => 'Create and/or use a working directory in the current directory'
     def converge
-      work_dir = options[:dir]
-      if not work_dir
-        if ENV['SPAUX_HOME']
-          work_dir = ENV['SPAUX_HOME']
-        elsif options[:current]
-          work_dir = ::File.join(ENV['PWD'], 'current')
-        else
-          work_dir = Dir.mktmpdir
-        end
-      end
+      work_dir = get_work_dir(options)
       FileUtils.mkdir_p work_dir
 
       client = Spaux::Chef::Client.new(work_dir)

data/lib/spaux/config.rb

@@ -0,0 +1,6 @@
+{
+  chef_private_key_gist_id: '16b65a73953427ce9c40',
+  private_key:              '~/.ssh/id_rsa',
+  aes_key_size:             256,
+  aes_cipher_mode:          :CBC
+}

data/lib/spaux/version.rb

@@ -1,3 +1,3 @@
 class Spaux
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/spaux.rb

@@ -4,10 +4,34 @@ require 'spaux/chef/client'
 require 'spaux/chef/knife'
 
 class Spaux
-  def self.default_knife_config
+  def self.default_config_dir(component)
     lib_dir = ::File.expand_path(::File::join(__FILE__, '..'))
-    knife_rb = ::File::join(lib_dir, 'spaux', 'defaults', 'knife.rb')
-    ::Chef::Config.from_string(::File.read(knife_rb), knife_rb)
+    dir = case component
+    when :chef
+      chef_conf_dir = ::File::join(lib_dir, 'spaux', 'chef', 'default')
+    when :spaux
+      spaux_conf_dir = ::File::join(lib_dir, 'spaux')
+    end
+  end
+
+  def self.default_chef_config(component)
+    filename = case component
+    when :client
+      'client.rb'
+    when :knife
+      'knife.rb'
+    else
+      raise 'Unknown component'
+    end
+
+    config_file = ::File.join(default_config_dir(:chef), filename)
+    ::Chef::Config.from_string(::File.read(config_file), config_file)
     ::Chef::Config.configuration
   end
+
+  def self.default_spaux_config
+    config_dir = default_config_dir(:spaux)
+    config_file = ::File.join(config_dir, 'config.rb')
+    configuration = eval(::File.read(config_file))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaux
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Miguel Landaeta
@@ -183,12 +183,14 @@ files:
 - examples/knife_minimal.rb
 - lib/spaux.rb
 - lib/spaux/chef/client.rb
+- lib/spaux/chef/default/client.rb
+- lib/spaux/chef/default/knife.rb
 - lib/spaux/chef/key.rb
 - lib/spaux/chef/knife.rb
-- lib/spaux/chef/knife_monkey_patches.rb
-- lib/spaux/chef/monkey_patches.rb
+- lib/spaux/chef/monkey_patches/client.rb
+- lib/spaux/chef/monkey_patches/knife.rb
 - lib/spaux/cli.rb
-- lib/spaux/defaults/knife.rb
+- lib/spaux/config.rb
 - lib/spaux/version.rb
 - spaux.gemspec
 - spec/spaux_spec.rb