knife-solve 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d332768f80c8c740d920219dac2923499fd432cb
-  data.tar.gz: cd678a884858bded993e8536a6e6f2a0c53e3429
+  metadata.gz: 80174841ace3f60ff00027bc0ce61dab6046edd5
+  data.tar.gz: ca1c16978219a2a171591f7940c046c435acef67
 SHA512:
-  metadata.gz: aa0acebe839e6408ee7e0352c440e19c2f31ba8c3750186a67afdc9f8c25d342e7d42524beb22f6ee2ae12beca11c541b9bc4d7e46df9e083de3bdfe7d27ecd6
-  data.tar.gz: c2fe5c24e56ed3419509b75c0c4849718ac2f912e1c5a5675d240e1c43e70b7bd5c3006001c8ed5e3404f673491b2bb3f953639178df2f12e6072e2afded06c7
+  metadata.gz: c8c7bf5377c8ea01127faf89bd6dc6fef2b9cb9a786670096691a9dbd56fb3b72db60ea145ab29c5841d4b689bc99ea8fa2676c36982899232a3b777e577d272
+  data.tar.gz: f0a2a5498cfb383899026af9cf9b3ba98dd5a6ed41839077bcc86397f4fd1b3aa9581390e42ee1eabc9bf9c474ab080c34e5f4fe63d6316c8ea11e48d84df6eb

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,6 @@
+sudo: false
+cache: bundler
+language: ruby
+rvm:
+- "2.2"
+script: bundle exec rake test

data/Gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2014-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
+
+source 'https://rubygems.org'
+
+gemspec

data/README.md

@@ -22,6 +22,12 @@ As with all knife plugins, just install the gem:
 gem install knife-solve
 ```
 
+Or if you use ChefDK:
+
+```
+chef gem install knife-solve
+```
+
 Usage
 -----
 

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright 2014, Noah Kantrowitz
+# Copyright 2014-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,20 @@
 # limitations under the License.
 #
 
-require 'bundler'
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rspec/core/rake_task'
-
-Bundler::GemHelper.install_tasks
-
-task :default => :spec
+require 'bundler/gem_tasks'
 
-desc 'Run specs'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec, :tag) do |t, args|
+  t.rspec_opts = [].tap do |a|
+    a << '--color'
+    a << "--format #{ENV['CI'] ? 'documentation' : 'Fuubar'}"
+    a << '--backtrace' if ENV['DEBUG']
+    a << "--seed #{ENV['SEED']}" if ENV['SEED']
+    a << "--tag #{args[:tag]}" if args[:tag]
+  end.join(' ')
 end
 
-gem_spec = eval(File.read('knife-solve.gemspec'))
+desc 'Run all tests'
+task :test => [:spec]
+
+task :default => [:test]

data/knife-solve.gemspec

@@ -0,0 +1,42 @@
+#
+# Copyright 2014-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
+
+$:.unshift(File.dirname(__FILE__) + '/lib')
+require 'knife-solve/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'knife-solve'
+  spec.version = KnifeSolve::VERSION
+  spec.authors = ['Noah Kantrowitz']
+  spec.email = %w{noah@coderanger.net}
+  spec.description = 'A knife plugin to display cookbook version solutions.'
+  spec.summary = spec.description
+  spec.homepage = 'https://github.com/coderanger/knife-solve'
+  spec.license = 'Apache 2.0'
+
+  spec.files = `git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = %w{lib}
+
+  spec.add_dependency 'chef', '>= 11.0'
+
+  spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'rspec-its', '~> 1.2'
+  spec.add_development_dependency 'chefspec', '~> 4.2'
+  spec.add_development_dependency 'fuubar', '~> 2.0'
+  spec.add_development_dependency 'simplecov', '~> 0.9'
+end

data/lib/chef/knife/solve.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014, Noah Kantrowitz
+# Copyright 2014-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 require 'chef/knife'
 require 'chef/run_list/run_list_expansion'
+require 'chef/run_list/run_list_item'
 
 class Chef
   class Knife
@@ -32,7 +33,8 @@ class Chef
 
       def run
         environment = config[:environment]
-        cookbooks = name_args
+        cookbooks = name_args.map {|item| item.to_s.split(/,/) }.flatten.each{|item| item.strip! }
+        cookbooks.delete_if {|item| item.empty? }
         if config[:node]
           node = Chef::Node.load(config[:node])
           environment ||= node.chef_environment

data/lib/knife-solve.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014, Noah Kantrowitz
+# Copyright 2014-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/knife-solve/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014, Noah Kantrowitz
+# Copyright 2014-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,5 +15,5 @@
 #
 
 module KnifeSolve
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/solve_spec.rb

@@ -0,0 +1,85 @@
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 'spec_helper'
+require 'chef/knife/solve'
+
+describe Chef::Knife::Solve do
+  ROLES = {'web' => %w{httpd python}, 'db' => %w{}}
+
+  let(:argv) { [] }
+  let(:rest) { double('Chef::ServerApi') }
+  subject { described_class.new(argv) }
+  before do
+    allow(subject).to receive(:rest).and_return(rest)
+    allow(subject).to receive(:msg)
+    allow(subject).to receive(:ui).and_return(double(info: nil))
+    allow(Chef::RunList::RunListExpansionFromAPI).to receive(:new) do |_envirionment, run_list, _rest|
+      recipes = run_list.map do |item|
+        case item.type
+        when :role
+          ROLES[item.name] || begin
+            raise "unknown role #{item.name}"
+          end
+        when :recipe
+          item.name
+        else
+          raise "unknown run list item #{item}"
+        end
+      end.flatten
+      double('RunListExpansionFromAPI', expand: nil, recipes: recipes)
+    end
+  end
+  def expect_post(cookbooks, environment)
+    expect(rest).to receive(:post_rest).with("/environments/#{environment}/cookbook_versions", 'run_list' => cookbooks).and_return([])
+    subject.run
+  end
+
+  context 'with a single argument' do
+    let(:argv) { %w{foo} }
+    it { expect_post(%w{foo}, '_default') }
+  end # /context with a single argument
+
+  context 'with a two arguments' do
+    let(:argv) { %w{foo bar} }
+    it { expect_post(%w{foo bar}, '_default') }
+  end # /context with a two arguments
+
+  context 'with a recipe' do
+    let(:argv) { %w{recipe[foo]} }
+    it { expect_post(%w{foo}, '_default') }
+  end # /context with a recipe
+
+  context 'with a role' do
+    let(:argv) { %w{role[web]} }
+    it { expect_post(%w{httpd python}, '_default') }
+  end # /context with a role
+
+  context 'with comma-separated arguments' do
+    let(:argv) { %w{foo,bar} }
+    it { expect_post(%w{foo bar}, '_default') }
+  end # /context with comma-separated arguments
+
+  context 'with a role and a recipe' do
+    let(:argv) { %w{role[web] recipe[other]} }
+    it { expect_post(%w{httpd python other}, '_default') }
+  end # /context with a role and a recipe
+
+  context 'with a single comma-separated argument' do
+    let(:argv) { ['foo, bar'] }
+    it { expect_post(%w{foo bar}, '_default') }
+  end # /context with a single comma-separated argument'
+end

data/spec/spec_helper.rb

@@ -0,0 +1,31 @@
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 'rake'
+require 'rspec'
+require 'rspec/its'
+
+RSpec.configure do |config|
+  # Basic configuraiton
+  config.run_all_when_everything_filtered = true
+  config.filter_run(:focus)
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-solve
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -16,55 +16,103 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !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: rake
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: chefspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: A knife plugin to display cookbook version solutions.
-email: noah@coderanger.net
+email:
+- noah@coderanger.net
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
+extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- knife-solve.gemspec
 - lib/chef/knife/solve.rb
 - lib/knife-solve.rb
 - lib/knife-solve/version.rb
+- spec/solve_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/coderanger/knife-solve
 licenses:
 - Apache 2.0
@@ -85,8 +133,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A knife plugin to display cookbook version solutions.
-test_files: []
+test_files:
+- spec/solve_spec.rb
+- spec/spec_helper.rb