omnibus-ctl 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f727fad81d619b5de76e830757918590df8b636
-  data.tar.gz: 2a606b930145058c04f31a36f14ff4f32f1d1449
+  metadata.gz: 443379da47208384a63e0fc8e382cd03646e9083
+  data.tar.gz: 221bd434c9d7ba7da741582343a4ac16a52dc61f
 SHA512:
-  metadata.gz: ed89feaa9a4cfedb22f06640efd44644f1908cc6c254ba19185e41e144d722006855cb57c451c86e293448a3269ecae36acf725948cab7f83539df0e01aec4f7
-  data.tar.gz: 4627bd21c3569788abdca489e4d94096d847861fbfee83f35eb9cbbaeb67e29c4859dd5e67507ad8e94fe9d4f849d4ccee3a805aac8ab9ff6830263b37c57a21
+  metadata.gz: e24c6610b8b2f7d09d0094b9c172c501de14a46e537d2bdb0bed5768c6caf4a7d429143936c1d10ea4c28881205d2e4dcdcee197f9b503b9b308aaa61ec5d3df
+  data.tar.gz: 53d26b2824c01bdeddde2cf75418fa8fe8d549f5ae22878dad90bfe7014536163591559563311e5f37a30705f45edb6efbc9ef6a3f5a8540f17804111ae572cb

data/README.md

@@ -1,5 +1,7 @@
 ## omnibus-ctl
 
+[![Build Status Master](https://travis-ci.org/chef/omnibus-ctl.svg?branch=master)](https://travis-ci.org/chef/omnibus-ctl)
+
 omnibus-ctl provides service control and configuration for omnibus packages.
 
 Not much to see here yet.

data/lib/omnibus-ctl.rb

@@ -155,10 +155,14 @@ module Omnibus
 
     def load_files(path)
       Dir["#{path}/*.rb"].each do |file|
-        eval(IO.read(file))
+        load_file(file)
       end
     end
 
+    def load_file(filepath)
+      eval(IO.read(filepath))
+    end
+
     def add_command(name, description, arity=1, &block)
       @command_map[name] = { :desc => description, :arity => arity }
       metaclass = class << self; self; end
@@ -385,8 +389,24 @@ module Omnibus
       end
     end
 
+    def remove_old_node_state
+      node_cache_path = "#{base_path}/embedded/nodes/"
+      status = run_command("rm -rf #{node_cache_path}")
+      if ! status.success?
+        log "Could not remove cached node state!"
+        exit! 1
+      end
+    end
+
+    def run_chef(attr_location, args='')
+      remove_old_node_state
+      cmd = "#{base_path}/embedded/bin/chef-client -z -c #{base_path}/embedded/cookbooks/solo.rb -j #{attr_location}"
+      cmd += " #{args}" unless args.empty?
+      run_command(cmd)
+    end
+
     def show_config(*args)
-      status = run_command("#{base_path}/embedded/bin/chef-client -z -c #{base_path}/embedded/cookbooks/solo.rb -j #{base_path}/embedded/cookbooks/show-config.json -l fatal")
+      status = run_chef("#{base_path}/embedded/cookbooks/show-config.json", "-l fatal")
       if status.success?
         exit! 0
       else
@@ -395,7 +415,7 @@ module Omnibus
     end
 
     def reconfigure(exit_on_success=true)
-      status = run_command("#{base_path}/embedded/bin/chef-client -z -c #{base_path}/embedded/cookbooks/solo.rb -j #{base_path}/embedded/cookbooks/dna.json")
+      status = run_chef("#{base_path}/embedded/cookbooks/dna.json")
       if status.success?
         log "#{display_name} Reconfigured!"
         exit! 0 if exit_on_success

data/lib/omnibus-ctl/version.rb

@@ -1,5 +1,5 @@
 module Omnibus
   class Ctl
-    VERSION = "0.3.3"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omnibus-ctl
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Opscode, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement