comrad 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dfa87d9578aa1e1a8b8b7a97478bcf05bd1cf44
-  data.tar.gz: bd6185ef69ad44addb7361a29bccb76d6911390f
+  metadata.gz: 2926a0719cb7f9bd18f2524c428aaf197d5511f9
+  data.tar.gz: 6abec92ec8804e07c3442480bde7328128c5f1e2
 SHA512:
-  metadata.gz: ce3f3ffcc9414ec1961e6b42036698bdf7d3baef589775de4e150c958a0ba51f0a38c3e2a079ff8208c2c1da6f19304d8caed793853e193487a506dffe4506e3
-  data.tar.gz: 8dac30ea4540aceda52244d4aeb376ee1e46c4a6f05b142bc657de30c2760574976e792e937582060cca7e48e0da2f9d091bd59e3e9e4be1fef08c851ea73e40
+  metadata.gz: 742c737000629566f0f19e25d2e31edf4735daec6c1911e607f580996003e71be6d00a30b84c56556a0bd28641c28fe82dacce3ad3ad9e1bbdb835c3292c115a
+  data.tar.gz: 05999c5cabf106dd56f267db5c7aa7f949921203a062167063c55e5eafb72ad660b2cbec93620e42e3603e48a17593959af0ffca88a50dc9f9733bdf4db3c619

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 cache:
   - bundler

data/README.md

@@ -23,7 +23,7 @@ Example YAML config:
   ---
 slack:
   webhook_url: 'https://hooks.slack.com/services/123/123/123
-  channel: 'ops-channel'
+  channel: '#ops-channel'
 jenkins:
   workspace_dir: '/var/jenkins/workspaces/myjob/'
   url: 'http://jenkins.int.myco.co/'

data/comrad.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'comrad'
-  s.version     = '0.1.4'
+  s.version     = '0.2.0'
   s.date        = Date.today.to_s
   s.platform = Gem::Platform::RUBY
   s.extra_rdoc_files = ['README.md', 'LICENSE']
@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
   s.add_dependency 'rest-client', '~> 1.7.0'
   s.add_dependency 'chef', '>= 11.0'
-  s.add_dependency 'slack-post', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'slack-post', '~> 0.3', '>= 0.3.2'
   s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rubocop', '~> 0.32.0'
+  s.add_development_dependency 'rubocop', '~> 0.33.0'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.name

data/lib/comrad.rb

@@ -15,8 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-require 'pp'
-
 require 'core_ext/string'
 
 require 'comrad/config'
@@ -44,7 +42,7 @@ module Comrad
     end
 
     'The following chef objects will be changed'.marquee
-    pp Changeset.changes
+    puts Changeset.changes.to_yaml.gsub("---\n", '')
 
     'Making Chef Changes'.marquee
     Chef.process_changes

data/lib/comrad/chef.rb

@@ -42,12 +42,28 @@ module Comrad
       ]
     end
 
-    # run the provided knife command
-    def self::excute_knife_cmd(cmd)
+    # handle the actual shell out
+    def self::shell_out(cmd)
+      require 'open3'
+      puts "Running #{cmd}..."
+      Open3.popen3(cmd) do |_stdin, _stdout, stderr, thread|
+        unless thread.value.success?
+          puts 'Failed to run the knife command with the following error:'.to_red
+          puts stderr.read
+        end
+      end
+    end
+
+    # determine if we should shell out or print and then do it
+    def self::execute_knife_cmd(cmd)
+      # dry mode will just show what we would do
       if Config.config['flags']['dryrun']
         puts "I would be running '#{cmd}'"
-      else
-        puts "Live mode is not implemented. Not performing '#{cmd}'"
+      # are we in scary mode or not running a delete command
+      elsif Config.config['flags']['scary'] || !cmd.include?('delete')
+        shell_out(cmd)
+      else # we're trying to delete something w/o scary mode enabled
+        puts "#{cmd} skipped. Enable scary-mode to allow deletes."
       end
     end
 
@@ -56,7 +72,7 @@ module Comrad
       Changeset.changes.each_pair do |item_class, action_pairs|
         next if action_pairs.empty?
         action_pairs.each_pair do |item, action|
-          excute_knife_cmd(knife_command(item_class, item, action))
+          execute_knife_cmd(knife_command(item_class, item, action))
         end
       end
     end

data/lib/comrad/config.rb

@@ -45,7 +45,7 @@ module Comrad
     # make sure we have a build number
     def self::validate_config(conf)
       if conf['buildnum'].nil?
-        puts "Jenkins set BUILD_NUMBER environmental variable not set, and Comrad --buildnum CLI flag not used. Cannot continue without a build number.\n\n"
+        puts "Jenkins set BUILD_NUMBER environmental variable not set, and Comrad --build-num CLI flag not used. Cannot continue without a build number.\n\n"
         exit!
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comrad
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -47,7 +47,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
 description: Your rad comrade - Sync changes from git to Chef Server via Jenkins
 email: tim@cozy.co
 executables:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Your rad comrade - Sync changes from git to Chef Server via Jenkins