chefdepartie 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffda5a4e9b1258d25ba59354dbdb73148af675b4
-  data.tar.gz: ad14a0b279ec6541be45be51ef4fbbbd350c6367
+  metadata.gz: 4798d0d48e4fa238966cc55491e6febb0fe5db10
+  data.tar.gz: 0ccc4bc0eb60298ba3c32c4910dff89a24c823f2
 SHA512:
-  metadata.gz: ff88fbed52f7d75d518a8b1924bf9c4b179bd0d67ee110dcc778d21040658f3c5d5b4663df905c05c883d260ad04eb207c341670ba0a535b9770b49966200323
-  data.tar.gz: abf7fa5b9c495221ae3425e7150716ef8f93120eb7a0164772f8294d270f9f972066143798892a481dd25fa79ec0eb72cae2eb3be56acee4da992f104b177325
+  metadata.gz: 6244d41cd09e6ddb218c0c04019fc5cc817becf94805cce27f7f280fe062c914242902bacd2614835e7c66465ed005ac9bdadeeed15ab289ea65f8a11a0ab9bd
+  data.tar.gz: 9f51599b27ca12a0783bc3f37398e9e08054bd90b8b33c45641a289e25ea58d1e9aae0f2a1bda87cf30eb13658e51ece493f24517b947c67638ff277c5732b0e

data/Gemfile

@@ -5,4 +5,3 @@ gemspec
 group :test do
   gem 'simplecov', '=0.10.0'
 end
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chefdepartie (0.0.3)
+    chefdepartie (0.0.4)
       chef (~> 12.3.0)
       chef-zero (~> 4.2.2)
       librarian-chef (~> 0.0.4)
@@ -42,7 +42,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    ffi (1.9.8)
+    ffi (1.9.10)
     ffi-yajl (2.2.0)
       libyajl2 (~> 1.2)
     hashie (2.1.2)
@@ -67,7 +67,7 @@ GEM
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
     mixlib-shellout (2.1.0)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
@@ -76,9 +76,10 @@ GEM
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    ohai (8.4.0)
+    net-telnet (0.1.1)
+    ohai (8.5.0)
       ffi (~> 1.9)
-      ffi-yajl (>= 1.1, < 3.0)
+      ffi-yajl (~> 2.2)
       ipaddress
       mime-types (~> 2.0)
       mixlib-cli
@@ -93,13 +94,13 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.2)
+    rack (1.6.4)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.0)
+    rspec-core (3.3.1)
       rspec-support (~> 3.3.0)
     rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -107,27 +108,30 @@ GEM
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.3.0)
+    rspec-mocks (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    serverspec (2.18.0)
+    serverspec (2.19.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.35)
+    sfl (2.2)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    specinfra (2.35.1)
+    specinfra (2.37.1)
       net-scp
-      net-ssh
+      net-ssh (~> 2.7)
+      net-telnet
+      sfl
     systemu (2.6.5)
     thor (0.19.1)
     uuidtools (2.1.5)

data/chefdepartie.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'https://rubygems.org/gems/chefdepartie'
   spec.license     = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'chef', '~> 12.3.0'
   spec.add_runtime_dependency 'chef-zero', '~> 4.2.2'

data/lib/chefdepartie.rb

@@ -5,31 +5,57 @@ require_relative 'chefdepartie/role'
 require_relative 'chefdepartie/cookbook'
 require_relative 'chefdepartie/databag'
 
+# Chefdepartie root namespace for core module commands
 module Chefdepartie
   def self.run(**kwargs)
-
     # Load the configuration
-    config = kwargs[:config]
-    Chef::Config.from_file(config)
+    config_file = kwargs[:config_file] || ENV['CHEFDEPARTIE_CONFIG']
+    load_config(config_file, kwargs[:config])
+    background = kwargs[:background]
 
     # Start the chef-zero server
-    server_thread = start_server
+    self.server_thread = start_server(background)
 
     # Upload everything
     upload_all
 
-    # Now that everything has been uploaded, we'll join the server thread
-    puts "Ready"
-    server_thread.join
+    # Notify that the chef server is ready
+    puts 'Ready'
+
+    # Join the chef server thread now that everything has been uploaded
+    self.server_thread.join unless background
+  end
+
+  def self.stop
+    puts 'Stopping server'
+    server_thread.stop
+  end
+
+  private
+
+  def self.server_thread=(thread)
+    @@server_thread = thread
   end
 
-private
+  def self.server_thread
+    @@server_thread
+  end
 
   def self.upload_all
     Chefdepartie::Roles.upload_all
     Chefdepartie::Databags.upload_all
     Chefdepartie::Cookbooks.upload_all
   end
-end
 
-Chefdepartie.run(config: ENV['CHEFDEPARTIE_CONFIG']) # FIXME: use something better than an env var to get the config
+  def self.load_config(config_file, config)
+    # Load config from config file if provided
+    Chef::Config.from_file(config_file) if File.exist?(config_file)
+
+    # Load config from hash
+    if config && config.is_a?(Hash)
+      config.each do |k, v|
+        Chef::Config.send(k.to_sym, v)
+      end
+    end
+  end
+end

data/lib/chefdepartie/cookbook.rb

@@ -5,21 +5,21 @@ require 'librarian'
 require 'librarian/chef'
 
 module Chefdepartie
+  # Handle finding and uploading cookbooks
   module Cookbooks
-
     def self.upload_all
       cookbooks = File.dirname(Chef::Config[:cookbook_path])
       Dir.chdir(cookbooks) do
-        puts "Uploading librarian cookbooks"
+        puts 'Uploading librarian cookbooks'
         upload_cheffile
 
-        puts "Uploading site cookbooks"
-        books = Dir["cookbooks/*"]
+        puts 'Uploading site cookbooks'
+        books = Dir['cookbooks/*']
         upload_site_cookbooks(books)
       end
     end
 
-  private
+    private
 
     def self.upload_cookbooks(path, books)
       loader = Chef::CookbookLoader.new(path)
@@ -27,14 +27,14 @@ module Chefdepartie
       books = books.collect do |name|
         status = :new
         cookbook = loader.load_cookbook(name)
-        raise "could not load cookbook #{name} " if cookbook.nil?
+        fail "could not load cookbook #{name} " if cookbook.nil?
         cookbook
       end.compact
 
       rest = Chef::REST.new(Chef::Config[:chef_server_url])
 
       begin
-        Chef::CookbookUploader.new(books, {force: true, rest: rest}).upload_cookbooks
+        Chef::CookbookUploader.new(books, force: true, rest: rest).upload_cookbooks
       rescue SystemExit => e
         raise "Cookbook upload exited with status #{e.status}"
       end
@@ -59,8 +59,8 @@ module Chefdepartie
 
     def self.upload_cheffile
       unless ENV['NO_LIBRARIAN']
-        system("librarian-chef install")
-        upload_cookbooks("tmp/librarian/cookbooks", cheffile_cookbooks.map(&:name))
+        system('librarian-chef install')
+        upload_cookbooks('tmp/librarian/cookbooks', cheffile_cookbooks.map(&:name))
       end
     end
 

data/lib/chefdepartie/databag.rb

@@ -13,7 +13,7 @@ module ChefZero
       def self.normalize_data_bag_item(data_bag_item, data_bag_name, id, method)
         if method == 'DELETE'
           # TODO SERIOUSLY, WHO DOES THIS MANY EXCEPTIONS IN THEIR INTERFACE
-          if !(data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data'])
+          unless data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
             data_bag_item['id'] ||= id
             data_bag_item = { 'raw_data' => data_bag_item }
             data_bag_item['chef_type'] ||= 'data_bag_item'
@@ -24,7 +24,7 @@ module ChefZero
         else
           # If it's not already wrapped with raw_data, wrap it.
           if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
-            #data_bag_item = data_bag_item['raw_data']
+            # data_bag_item = data_bag_item['raw_data']
           end
           # Argh.  We don't do this on GET, but we do on PUT and POST????
           if %w(PUT POST).include?(method)
@@ -42,13 +42,13 @@ end
 module Chefdepartie
   module Databags
     def self.upload_all
-      puts "Uploading databags"
+      puts 'Uploading databags'
       cookbooks = File.dirname(Chef::Config[:cookbook_path])
-      bags = Dir[File.join(cookbooks,'data_bags','/*')]
+      bags = Dir[File.join(cookbooks, 'data_bags', '/*')]
       upload_all_data_bags(bags)
     end
 
-  private
+    private
 
     def self.upload_data_bag_items(items)
       current_bags = Chef::DataBag.list.keys.to_set
@@ -75,7 +75,7 @@ module Chefdepartie
 
       data_bags.each do |data_bag|
         bag_name = File.basename(data_bag)
-        files = Dir.glob(File.join(data_bag,"*.json")).flatten
+        files = Dir.glob(File.join(data_bag, '*.json')).flatten
 
         files.each do |item_file|
           raw_data = Chef::JSONCompat.from_json(IO.read(item_file))
@@ -96,8 +96,8 @@ module Chefdepartie
 
     def self.is_encrypted_data_bag?(raw_data)
       # TODO: use Chef::EncryptedDataBagItem::CheckEncrypted when we move to Chef 12
-      first_sub_item = Array(raw_data.find { |k, v| k != 'id' }).last
-      !!(first_sub_item.kind_of?(Hash) && first_sub_item['encrypted_data'] && first_sub_item['cipher'])
+      first_sub_item = Array(raw_data.find { |k, _v| k != 'id' }).last
+      !!(first_sub_item.is_a?(Hash) && first_sub_item['encrypted_data'] && first_sub_item['cipher'])
     end
   end
 end

data/lib/chefdepartie/role.rb

@@ -3,16 +3,15 @@ require 'chef/role'
 
 module Chefdepartie
   module Roles
-
     def self.upload_all
-      puts "Uploading roles"
+      puts 'Uploading roles'
       cookbooks = File.dirname(Chef::Config[:cookbook_path])
       roles = []
-      Find.find(File.join(cookbooks,'roles')){ |f| roles << f if f =~ /\.rb$/}
+      Find.find(File.join(cookbooks, 'roles')) { |f| roles << f if f =~ /\.rb$/ }
       upload_site_roles(roles)
     end
 
-  private
+    private
 
     def self.upload_site_roles(files)
       roles = {}

data/lib/chefdepartie/server.rb

@@ -1,11 +1,16 @@
 require 'chef_zero/server'
 require 'uri/generic'
 
-def start_server
+def start_server(background)
   port = URI(Chef::Config[:chef_server_url]).port
   server = ChefZero::Server.new(host: '0.0.0.0', port: port)
-  Thread.new do
-    server.start#_background
+
+  if background
+    server.start_background
+    server
+  else
+    Thread.new do
+      server.start
+    end
   end
 end
-

data/lib/chefdepartie/version.rb

@@ -1,3 +1,4 @@
+# Store version info
 module Chefdepartie
-  VERSION='0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chefdepartie
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dale Hamel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef