knife-spork 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f41664f90da0809a4d75a015883b920cbcbf9a0
-  data.tar.gz: cd5d2629b7a32ead1d32d6b11649c478f91bef21
+  metadata.gz: ed2d90462c49f6dd058ff7d5df3c8e15fb0ce541
+  data.tar.gz: 9a34114efd252e64ec1c0260e23ef415dae06139
 SHA512:
-  metadata.gz: 8b5fd7c94fe33abeef46f3a00f6d0403a450c5f5c9206b3aae4cc6042e77112ff2690ddbcf781d4148966cb917ecc00ccd7fbbb5fa694f61ed7aeda2db6c7b25
-  data.tar.gz: 73d8bedaac9e18b72fd72fb878b6566c5392b77a87894226288262ae284d7d0eab826708cea9f496fe155f6cc6cf4bea19c9e0339721492c6e1d3b01cce61e8c
+  metadata.gz: 12082e66af466bd59956dda2bdf13312fc2f785e2fb74be2d11531c30583a30fb290f5f76d01d1cf619a16f3e85ff63498d1297d4788ca49bc6ea1b57a90526f
+  data.tar.gz: 8e217c599c8bf546a12e647dbe311d2600c7175f0eee1c078c3ab51bb6a468d3b1de542d0d1139a66477e5995b90d4e8806a224a0647e0b6fc35b9faaae22663

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.4
+ruby-2.4.0

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.7.0 (12th October 2017)
+
+Features:
+
+    - Rubocop plugin now supports cookstyle (thanks to timurb https://github.com/jonlives/knife-spork/pull/211)
+    - Spork info will now dump config as yml (Thanks to jeunito https://github.com/jonlives/knife-spork/pull/215)
+    - Spork promote will now prefer the environment path passed in on the command line (Thanks to shoekstra https://github.com/jonlives/knife-spork/pull/216)
+    - Add knife spork version command (Thanks to jeunito https://github.com/jonlives/knife-spork/pull/217)
+    
+Bugfixes:
+
+    - Fix error with Chef server when uploading cookbook with no deps (Thanks to timurb https://github.com/jonlives/knife-spork/pull/210)
+    - Fix unclear error when trying to promote a non-existant cookbook (Thanks to timurb https://github.com/jonlives/knife-spork/pull/213)
+
 ## 1.6.3(12th December, 2016)
 
 Features:

data/README.md

@@ -118,6 +118,7 @@ plugins:
     out_file: <file>
     sev_level: <C|W|E>
     lint: false
+    use_cookstyle: true
 ```
 
 #### Default Environments

data/knife-spork.gemspec

@@ -1,8 +1,10 @@
 $:.push File.expand_path('../lib', __FILE__)
 
+require "knife-spork/version"
+
 Gem::Specification.new do |gem|
   gem.name          = 'knife-spork'
-  gem.version       = '1.6.3'
+  gem.version       = KnifeSpork::Version::VERSION
   gem.authors       = ["Jon Cowie", "Katherine Daniels"]
   gem.email         = ['jonlives@gmail.com', 'kdaniels@etsy.com']
   gem.homepage      = 'https://github.com/jonlives/knife-spork'

data/lib/chef/knife/spork-info.rb

@@ -1,4 +1,5 @@
 require 'chef/knife'
+require 'yaml'
 
 module KnifeSpork
   class SporkInfo < Chef::Knife
@@ -21,7 +22,7 @@ module KnifeSpork
     private
     def info
       ui.msg "Config Hash:"
-      ui.msg "#{spork_config.to_hash}"
+      ui.msg spork_config.to_yaml
       ui.msg ""
       ui.msg "Plugins:"
       KnifeSpork::Plugins.klasses.each do |klass|

data/lib/chef/knife/spork-upload.rb

@@ -122,23 +122,30 @@ module KnifeSpork
 
     # Ensures that all the cookbooks dependencies are either already on the server or being uploaded in this pass
     def check_dependencies(cookbook)
+      negotiate_protocol_version
       cookbook.metadata.dependencies.each do |cookbook_name, version|
-        unless server_side_cookbooks(cookbook_name, version)
+        unless server_has_version(cookbook_name, version)
           ui.error "#{cookbook.name} depends on #{cookbook_name} (#{version}), which is not currently being uploaded and cannot be found on the server!"
           exit(1)
         end
       end
     end
 
-    def server_side_cookbooks(cookbook_name, version)
+    def server_has_version(cookbook_name, version)
+      hash = server_side_cookbooks[cookbook_name]
+      hash && hash['versions'] && hash['versions'].any?{ |v| Chef::VersionConstraint.new(version).include?(v['version']) }
+    end
+
+    def server_side_cookbooks
       if Chef::CookbookVersion.respond_to?(:list_all_versions)
         @server_side_cookbooks ||= Chef::CookbookVersion.list_all_versions
       else
         @server_side_cookbooks ||= Chef::CookbookVersion.list
       end
+    end
 
-      hash = @server_side_cookbooks[cookbook_name]
-      hash && hash['versions'] && hash['versions'].any?{ |v| Chef::VersionConstraint.new(version).include?(v['version']) }
+    def negotiate_protocol_version
+      server_side_cookbooks
     end
   end
 end

data/lib/chef/knife/spork-version.rb

@@ -0,0 +1,12 @@
+require 'chef/knife'
+require 'knife-spork/version'
+
+module KnifeSpork
+  class SporkVersion < Chef::Knife
+    banner 'knife spork version'
+
+    def run
+      ui.info KnifeSpork::Version::VERSION
+    end
+  end
+end

data/lib/knife-spork/plugins/rubocop.rb

@@ -7,7 +7,11 @@ module KnifeSpork
       hooks :after_check, :before_upload
 
       def perform
-        safe_require 'rubocop'
+        if config.use_cookstyle
+          safe_require 'cookstyle'
+        else
+          safe_require 'rubocop'
+        end
         safe_require 'rubocop/cli'
         safe_require 'rubocop/config_store'
 

data/lib/knife-spork/runner.rb

@@ -110,7 +110,9 @@ module KnifeSpork
       end
 
       def save_environment_changes(environment, json)
-        if spork_config[:environment_path]
+        if @config[:environment_path]
+          environments_path = @config[:environment_path]
+        elsif spork_config[:environment_path]
           environments_path = spork_config[:environment_path]
         else
           split_cb_path = cookbook_path.split("/")
@@ -192,7 +194,7 @@ module KnifeSpork
 
       def load_from_berkshelf(name)
         return unless defined?(::Berkshelf)
-        return unless ::File.exist?(self.config[:berksfile])
+        return unless self.config[:berksfile] && ::File.exist?(self.config[:berksfile])
         berksfile = ::Berkshelf::Berksfile.from_file(self.config[:berksfile])
         lockfile = ::Berkshelf::Lockfile.new(berksfile)
 

data/lib/knife-spork/version.rb

@@ -0,0 +1,5 @@
+module KnifeSpork
+  module Version
+    VERSION = "1.7.0"
+  end
+end

data/plugins/Rubocop.md

@@ -1,6 +1,6 @@
 Rubocop
 ==========
-Automatically runs rubocop against your cookbooks on check and upload.
+Automatically runs rubocop (or [cookstyle](https://github.com/chef/cookstyle) - its chef-focused brother) against your cookbooks on check and upload.
 This is entirely based off of the Foodcritic plugin.
 
 Gem Requirements
@@ -9,6 +9,7 @@ This plugin requires the following gems:
 
 ```ruby
 gem 'rubocop'
+gem 'cookstyle' # if you wish to use cookstyle behaviour
 ```
 
 Hooks
@@ -27,6 +28,7 @@ plugins:
     out_file: <file>
     sev_level: <C|W|E>
     lint: false
+    use_cookstyle: true
 ```
 
 #### epic_fail:
@@ -65,6 +67,12 @@ Set the severity level at which Rubocop will fail (see rubocop --help for more).
 - Rubocop command line equivilant: "--lint"
 Only run linting rules.
 
+#### use_cookstyle:
+- Type: `Boolean`
+- Default: `false`
+- Rubocop command line equivilant: none, use `cookstyle` command instead of `rubocop` command
+Cookstyle is a set of rubocop configurations that are specific to cookbooks.
+
 #### Example
 ``` ruby
 chef_workstation01$ knife spork check chef-client

data/spec/unit/spork_upload_spec.rb

@@ -35,10 +35,12 @@ module KnifeSpork
 
     describe '#upload' do
       before(:each) { set_chef_config }
-      it 'uploads cookbook' do
+      it 'uploads cookbook' do # and negotiates protocol version
         knife.instance_variable_set(:@cookbooks, knife.load_cookbooks(argv))
         knife.send(:upload)
+        ### for some reason could not make this expectation pass
+        # expect(Chef::CookbookVersion).to receive(:list_all_version)
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Jon Cowie
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -157,6 +157,7 @@ files:
 - lib/chef/knife/spork-role-edit.rb
 - lib/chef/knife/spork-role-fromfile.rb
 - lib/chef/knife/spork-upload.rb
+- lib/chef/knife/spork-version.rb
 - lib/knife-spork.rb
 - lib/knife-spork/plugins.rb
 - lib/knife-spork/plugins/campfire.rb
@@ -174,6 +175,7 @@ files:
 - lib/knife-spork/plugins/slack.rb
 - lib/knife-spork/plugins/statusnet.rb
 - lib/knife-spork/runner.rb
+- lib/knife-spork/version.rb
 - plugins/Campfire.md
 - plugins/Eventinator.md
 - plugins/Foodcritic.md
@@ -220,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A workflow plugin to help many devs work with the same chef repo/server