knife-solo 0.3.0.pre2 → 0.3.0.pre3

data/lib/knife-solo/config.rb

@@ -1,39 +0,0 @@
-require 'chef/config'
-
-module KnifeSolo
-  # Encapsulates some logic for checking and extracting
-  # path configuration from the structure of the
-  # current kitchen
-  class Config
-    def solo_path
-      Chef::Config.knife[:solo_path]
-    end
-
-    def chef_path
-      solo_path || './chef-solo'
-    end
-
-    def cookbook_path
-      if using_custom_solorb?
-        Chef::Config.from_file('solo.rb')
-        Array(Chef::Config.cookbook_path).first
-      else
-        chef_path + '/cookbooks'
-      end
-    end
-
-    def patch_path
-      cookbook_path + "/chef_solo_patches/libraries"
-    end
-
-    def using_custom_solorb?
-      File.exist?('solo.rb')
-    end
-
-    def validate!
-      raise Error, "You have a solo.rb file, but knife[:solo_path] is not set. You probably need to delete solo.rb unless you've customized it. See https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0 for more information." if using_custom_solorb? && solo_path.nil?
-    end
-
-    class Error < StandardError; end
-  end
-end

data/lib/knife-solo/resources/solo.rb

@@ -1,6 +0,0 @@
-base = File.expand_path('..', __FILE__)
-
-data_bag_path             base + '/data_bags'
-encrypted_data_bag_secret base + '/data_bag_key'
-role_path                 base + '/roles'
-cookbook_path             [ base + '/site-cookbooks', base + '/cookbooks' ]

data/test/knife-solo/config_test.rb

@@ -1,38 +0,0 @@
-require 'test_helper'
-require 'knife-solo/config'
-
-class KnifeSoloConfigTest < TestCase
-  def setup
-    super
-    @config = KnifeSolo::Config.new
-  end
-
-  def teardown
-    super
-    FileUtils.rm_f 'solo.rb'
-  end
-
-  def test_uses_cookbook_path_from_solo_rb_if_available
-    write_file('solo.rb', <<-RUBY)
-      knife[:solo_path] = "./custom"
-      cookbook_path ["./custom/path"]
-    RUBY
-    assert_equal "./custom/path", @config.cookbook_path
-  end
-
-  def test_reads_chef_root_path_from_knife_config_or_defaults_to_home
-    assert_equal './chef-solo', @config.chef_path
-    Chef::Config.knife[:solo_path] = "/tmp/custom-chef-solo"
-    assert_equal "/tmp/custom-chef-solo", @config.chef_path
-  end
-
-  def test_fails_validation_if_user_has_solo_rb_and_no_solo_path
-    Chef::Config.knife[:solo_path] = nil
-    write_file('solo.rb', <<-RUBY)
-        cookbook_path ["custom/path"]
-    RUBY
-    assert_raises KnifeSolo::Config::Error do
-      @config.validate!
-    end
-  end
-end