berkshelf 2.0.18 → 3.0.0.beta1

data/spec/fixtures/cookbooks/example_cookbook/Berksfile.lock

@@ -1,4 +1,4 @@
 {
-  "sources": {
+  "dependencies": {
   }
 }

data/spec/fixtures/lockfiles/default.lock

@@ -1,6 +1,6 @@
 {
   "sha":"6b76225554cc1f7c0aea0f8b3f10c6743aeba67e",
-  "sources":{
+  "dependencies":{
     "build-essential":{
       "locked_version":"1.1.2"
     },

data/spec/spec_helper.rb

@@ -1,22 +1,12 @@
-# We set this variable to load additional test materials during cucumber
-# runs, since aruba runs in a subprocess. See lib/berkshelf/test.rb
-ENV['RUBY_ENV'] ||= 'test'
-
-require 'rubygems'
-require 'bundler'
 require 'spork'
 
 Spork.prefork do
-  require 'pp'
   require 'rspec'
   require 'webmock/rspec'
   require 'vcr'
+  require 'berkshelf/api/rspec'
 
-  APP_ROOT = File.expand_path('../../', __FILE__)
-  ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "spec", "tmp", "berkshelf")
-  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "spec", "config", "knife.rb")
-
-  Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
+  Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
 
   VCR.configure do |config|
     config.configure_rspec_metadata!
@@ -30,8 +20,10 @@ Spork.prefork do
     config.include Berkshelf::RSpec::FileSystemMatchers
     config.include Berkshelf::RSpec::ChefAPI
     config.include Berkshelf::RSpec::ChefServer
+    config.include Berkshelf::RSpec::Git
+    config.include Berkshelf::RSpec::PathHelpers
+    config.include Berkshelf::API::RSpec
 
-    # Disallow should syntax
     config.expect_with :rspec do |c|
       c.syntax = :expect
     end
@@ -42,25 +34,27 @@ Spork.prefork do
     config.run_all_when_everything_filtered = true
 
     config.before(:suite) do
-      Berkshelf::RSpec::ChefServer.start
       WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
+      Berkshelf::RSpec::ChefServer.start
+      Berkshelf::API::RSpec::Server.start
+      Berkshelf.set_format(:null)
+      Berkshelf.ui.mute!
     end
 
     config.after(:suite) do
-      Berkshelf::RSpec::ChefServer.stop
+      Berkshelf.ui.unmute!
     end
 
-    config.before(:each) do
-      Celluloid.shutdown
-      Celluloid.boot
-      clean_tmp_path
-      Berkshelf.cookbook_store = Berkshelf::CookbookStore.new(tmp_path.join("downloader_tmp"))
-      Berkshelf.set_format(:null)
-      Berkshelf.ui.mute!
+    config.before(:all) do
+      ENV['BERKSHELF_PATH'] = berkshelf_path.to_s
     end
 
-    config.after(:each) do
-      Berkshelf.ui.unmute!
+    config.before(:each) do
+      Berkshelf::API::RSpec::Server.clear_cache
+      clean_tmp_path
+      Berkshelf.initialize_filesystem
+      Berkshelf::CookbookStore.instance.initialize_filesystem
+      reload_configs
     end
   end
 
@@ -76,102 +70,6 @@ Spork.prefork do
 
     result
   end
-
-  def example_cookbook_from_path
-    @example_cookbook_from_path ||= Berkshelf::Cookbook.new('example_cookbook', path: File.join(File.dirname(__FILE__), 'fixtures', 'cookbooks'))
-  end
-
-  def app_root_path
-    Pathname.new(APP_ROOT)
-  end
-
-  def tmp_path
-    app_root_path.join('spec/tmp')
-  end
-
-  def fixtures_path
-    app_root_path.join('spec/fixtures')
-  end
-
-  def clean_tmp_path
-    FileUtils.rm_rf(tmp_path)
-    FileUtils.mkdir_p(tmp_path)
-  end
-
-  def git_origin_for(repo, options = {})
-    "file://#{generate_fake_git_remote("git@github.com/RiotGames/#{repo}.git", options)}/.git"
-  end
-
-  def generate_fake_git_remote(uri, options = {})
-    remote_bucket = Pathname.new(::File.dirname(__FILE__)).join('tmp', 'remote_repos')
-    FileUtils.mkdir_p(remote_bucket)
-
-    repo_name = uri.to_s.split('/').last.split('.')
-    name = if repo_name.last == 'git'
-      repo_name.first
-    else
-      repo_name.last
-    end
-    name = 'rspec_cookbook' if name.nil? or name.empty?
-
-    path = ''
-    capture(:stdout) do
-      Dir.chdir(remote_bucket) do
-        Berkshelf::Cli.new.invoke(:cookbook, [name], skip_vagrant: true, skip_test_kitchen: true, force: true)
-      end
-
-      Dir.chdir(path = remote_bucket.join(name)) do
-      run! "git config receive.denyCurrentBranch ignore"
-      run! "echo '# a change!' >> content_file"
-      run! "git add ."
-      run "git commit -am 'A commit.'"
-        options[:tags].each do |tag|
-          run! "echo '#{tag}' > content_file"
-          run! "git add content_file"
-          run "git commit -am '#{tag} content'"
-          run "git tag '#{tag}' 2> /dev/null"
-        end if options.has_key? :tags
-        options[:branches].each do |branch|
-          run! "git checkout -b #{branch} master 2> /dev/null"
-          run! "echo '#{branch}' > content_file"
-          run! "git add content_file"
-          run "git commit -am '#{branch} content'"
-          run "git checkout master 2> /dev/null"
-        end if options.has_key? :branches
-      end
-    end
-    path
-  end
-
-  def git_sha_for_ref(repo, ref)
-    Dir.chdir local_git_origin_path_for(repo) do
-      run!("git show-ref '#{ref}'").chomp.split(/\s/).first
-    end
-  end
-
-  def local_git_origin_path_for(repo)
-    remote_repos_path = tmp_path.join('remote_repos')
-    FileUtils.mkdir_p(remote_repos_path)
-    remote_repos_path.join(repo)
-  end
-
-  def clone_target
-    tmp_path.join('clone_targets')
-  end
-
-  def clone_target_for(repo)
-    clone_target.join(repo)
-  end
-
-  def run!(cmd)
-    out = `#{cmd}`
-    raise "#{cmd} did not succeed:\n\tstatus: #{$?.exitstatus}\n\toutput: #{out}" unless $?.success?
-    out
-  end
-
-  def run(cmd)
-    `#{cmd}`
-  end
 end
 
 Spork.each_run do
@@ -179,6 +77,8 @@ Spork.each_run do
 
   module Berkshelf
     class GitLocation
+      include Berkshelf::RSpec::Git
+
       alias :real_clone :clone
       def clone
         fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
@@ -189,4 +89,3 @@ Spork.each_run do
     end
   end
 end
-

data/spec/support/chef_api.rb

@@ -50,7 +50,6 @@ module Berkshelf
           "templates/default",
           "files/default",
           "attributes",
-          "definitions",
           "providers",
           "resources"
         ]
@@ -116,9 +115,9 @@ module Berkshelf
 
         def ridley
           @ridley ||= Ridley.new(
-            server_url:   Berkshelf.chef_config[:chef_server_url],
-            client_name:  Berkshelf.chef_config[:node_name],
-            client_key:   Berkshelf.chef_config[:client_key],
+            server_url: Berkshelf::RSpec::ChefServer.server_url,
+            client_name: Berkshelf.chef_config[:node_name],
+            client_key: Berkshelf.chef_config[:client_key],
             ssl: { verify: false }
           )
         end

data/spec/support/chef_server.rb

@@ -1,10 +1,13 @@
 require 'chef_zero/server'
+require 'json'
 
 module Berkshelf::RSpec
   module ChefServer
-    PORT = 8889
+    PORT = 4000
 
     class << self
+      attr_reader :server
+
       def clear_request_log
         @request_log = Array.new
       end
@@ -13,22 +16,24 @@ module Berkshelf::RSpec
         @request_log ||= Array.new
       end
 
-      def server
-        @server ||= ChefZero::Server.new(port: PORT, generate_real_keys: false)
-      end
-
       def server_url
-        (@server && @server.url) || "http://localhost:#{PORT}"
+        @server && @server.url
       end
 
-      def start
-        server.start_background
-        server.on_response do |request, response|
+      def start(options = {})
+        return @server if @server
+
+        options = options.reverse_merge(port: PORT)
+        options[:generate_real_keys] = false
+
+        @server = ChefZero::Server.new(options)
+        @server.start_background
+        @server.on_response do |request, response|
           request_log << [ request, response ]
         end
         clear_request_log
 
-        server
+        @server
       end
 
       def stop
@@ -38,6 +43,10 @@ module Berkshelf::RSpec
       def running?
         @server && @server.running?
       end
+
+      def reset!
+        @server && @server.clear_data
+      end
     end
 
     def chef_server
@@ -67,7 +76,7 @@ module Berkshelf::RSpec
     private
 
       def load_data(key, name, hash)
-        ChefServer.server.load_data({ key.to_s => { name => MultiJson.encode(hash) }})
+        ChefServer.server.load_data({ key.to_s => { name => JSON.generate(hash) }})
       end
   end
 end

data/spec/support/git.rb

@@ -0,0 +1,127 @@
+module Berkshelf
+  module RSpec
+    module Git
+      require 'buff/shell_out'
+      include Buff::ShellOut
+
+      require_relative 'path_helpers'
+      include Berkshelf::RSpec::PathHelpers
+
+      def git_origin_for(repo, options = {})
+        "file://#{generate_fake_git_remote("git@github.com/RiotGames/#{repo}.git", options)}/.git"
+      end
+
+      def generate_fake_git_remote(uri, options = {})
+        name = uri.split('/').last || 'rspec_cookbook'
+        name = name.gsub('.git', '')
+        path = remotes.join(name)
+
+        capture(:stdout) do
+          Dir.chdir(remotes) { generate_git_cookbook(name) }
+
+          Dir.chdir(path) do
+            shell_out "git config receive.denyCurrentBranch ignore"
+            shell_out "echo '# a change!' >> content_file"
+            shell_out "git add ."
+            shell_out "git commit -am 'A commit.'"
+
+            options[:tags].each do |tag|
+              shell_out "echo '#{tag}' > content_file"
+              shell_out "git add content_file"
+              shell_out "git commit -am '#{tag} content'"
+              shell_out "git tag '#{tag}' 2> /dev/null"
+            end if options[:tags]
+
+            options[:branches].each do |branch|
+              shell_out "git checkout -b #{branch} master 2> /dev/null"
+              shell_out "echo '#{branch}' > content_file"
+              shell_out "git add content_file"
+              shell_out "git commit -am '#{branch} content'"
+              shell_out "git checkout master 2> /dev/null"
+            end if options[:branches]
+          end
+        end
+
+        path
+      end
+
+      # Calculate the git sha for the given ref.
+      #
+      # @param [#to_s] repo
+      #   the repository to show the ref for
+      # @param [#to_s] ref
+      #   the ref to show
+      #
+      # @return [String]
+      def sha_for_ref(repo, ref)
+        Dir.chdir(remote_path(repo)) do
+          shell_out("git show-ref #{ref}").stdout.split(/\s/).first
+        end
+      end
+
+      # The clone path the given repo.
+      #
+      # @param [#to_s] repo
+      #   the name of the local repo
+      #
+      # @return [Pathname]
+      #   the path to the clone
+      def clone_path(repo)
+        clones.join(repo.to_s)
+      end
+
+      # The clone path the remote repo.
+      #
+      # @param [#to_s] repo
+      #   the name of the remote repo
+      #
+      # @return [Pathname]
+      #   the path to the clone
+      def remote_path(repo)
+        remotes.join(repo.to_s)
+      end
+
+      private
+        # The path to store the local git clones.
+        #
+        # @return [Pathname]
+        def clones
+          ensure_and_return(tmp_path.join('clones'))
+        end
+
+        # The path to store the git remotes.
+        #
+        # @return [Pathname]
+        def remotes
+          ensure_and_return(tmp_path.join('remotes'))
+        end
+
+        # Generate a cookbook by the given name.
+        #
+        # @param [#to_s] name
+        #   the name of the cookbook to create
+        # @param [Hash] options
+        #   the list ooptions to pass to the generator
+        def generate_git_cookbook(name, options = {})
+          options = {
+            skip_vagrant: true,
+            skip_test_kitchen: true,
+            force: true,
+          }.merge(options)
+
+          Berkshelf::Cli.new.invoke(:cookbook, [name.to_s], options)
+        end
+
+        # Make sure the given path exists and return the path
+        #
+        # @param [#to_s] path
+        #   the path to create and return
+        #
+        # @return [Pathname]
+        def ensure_and_return(path)
+          FileUtils.mkdir(path) unless File.exist?(path)
+          return Pathname.new(path).expand_path
+        end
+    end
+  end
+end

data/spec/support/kitchen.rb

@@ -0,0 +1,12 @@
+module Berkshelf
+  module RSpec
+    module Kitchen
+      require 'kitchen/generator/init'
+
+      def stub_kitchen!
+        generator = double('kitchen-generator', invoke_all: nil)
+        ::Kitchen::Generator::Init.stub(:new).with(any_args()).and_return(generator)
+      end
+    end
+  end
+end

data/spec/support/path_helpers.rb

@@ -0,0 +1,69 @@
+module Berkshelf
+  module RSpec
+    module PathHelpers
+      # The path to where berkshelf lives (tmp/berkshelf)
+      #
+      # @return [Pathname]
+      def berkshelf_path
+        tmp_path.join('berkshelf').expand_path
+      end
+
+      # The Berkshelf cookbook store
+      #
+      # @return [Berkshelf::CookbookStore]
+      def cookbook_store
+        Berkshelf.cookbook_store
+      end
+
+      # The tmp path where testing support/workspaces are
+      #
+      # @return [Pathname]
+      def tmp_path
+        Berkshelf.root.join('spec/tmp')
+      end
+
+      # The path to the spec fixtures
+      #
+      # @return [Pathname]
+      def fixtures_path
+        Berkshelf.root.join('spec/fixtures')
+      end
+
+      # The path to the Chef config fixture
+      #
+      # @return [String]
+      def chef_config_path
+        Berkshelf.root.join('spec/config/knife.rb').to_s
+      end
+
+      # The actual Chef config object
+      #
+      # @return [Bershelf::Chef::Config]
+      def chef_config
+        Berkshelf::Chef::Config.from_file(chef_config_path)
+      end
+
+      def clean_tmp_path
+        FileUtils.rm_rf(tmp_path)
+        FileUtils.mkdir_p(tmp_path)
+      end
+
+      private
+
+        # This is the magical "reset" function that gives us a clean working
+        # directory on each run.
+        #
+        # @return [nil]
+        def reload_configs
+          Berkshelf.chef_config = chef_config
+
+          # This fucking sucks...
+          load 'berkshelf/chef/config.rb'
+          load 'berkshelf/config.rb'
+
+          Berkshelf.config = Berkshelf::Config.new
+          nil
+        end
+    end
+  end
+end