berkshelf 1.1.6 → 1.2.0.rc1

data/lib/berkshelf/mixin/path_helpers.rb

@@ -0,0 +1,30 @@
+module Berkshelf::Mixin
+  # @author Jamie Winsor <reset@riotgames.com>
+  module PathHelpers
+    # Converts a path to a path usable for your current platform
+    #
+    # @param [String] path
+    #
+    # @return [String]
+    def platform_specific_path(path)
+      if RUBY_PLATFORM =~ /mswin|mingw|windows/
+        system_drive = ENV['SYSTEMDRIVE'] ? ENV['SYSTEMDRIVE'] : ""
+        path         = win_slashify File.join(system_drive, path.split('/')[2..-1])
+      end
+
+      path
+    end
+
+    # Convert a unixy filepath to a windowsy filepath. Swaps forward slashes for
+    # double backslashes
+    #
+    # @param [String] path
+    #   filepath to convert
+    #
+    # @return [String]
+    #   converted filepath
+    def win_slashify(path)
+      path.gsub(File::SEPARATOR, (File::ALT_SEPARATOR || '\\'))
+    end
+  end
+end

data/lib/berkshelf/mixin/shell_out.rb

@@ -0,0 +1,23 @@
+require 'mixlib/shellout'
+
+module Berkshelf::Mixin
+  # @author Jamie Winsor <reset@riotgames.com>
+  module ShellOut
+    # @return [Mixlib::ShellOut]
+    def shell_out(*command_args)
+      cmd = Mixlib::ShellOut.new(*command_args)
+      if STDOUT.tty?
+        cmd.live_stream = STDOUT
+      end
+      cmd.run_command
+      cmd
+    end
+
+    # @return [Mixlib::ShellOut]
+    def shell_out!(*command_args)
+      cmd = shell_out(*command_args)
+      cmd.error!
+      cmd
+    end
+  end
+end

data/lib/berkshelf/resolver.rb

@@ -1,5 +1,5 @@
 module Berkshelf
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Resolver
     extend Forwardable
 
@@ -22,8 +22,10 @@ module Berkshelf
         add_source(source, false)
       end
 
-      Array(options[:sources]).each do |source|
-        add_source_dependencies(source)
+      unless options[:skip_dependencies]
+        Array(options[:sources]).each do |source|
+          add_source_dependencies(source)
+        end
       end
     end
 

data/lib/berkshelf/ui.rb

@@ -1,5 +1,5 @@
 module Berkshelf
-  class UI < ::Thor::Shell::Basic
+  module UI
     # Mute the output of this instance of UI until {#unmute!} is called
     def mute!
       @mute = true
@@ -29,6 +29,10 @@ module Berkshelf
       say(message, color)
     end
 
+    def deprecated(message)
+      warn("[DEPRECATION] #{message}")
+    end
+
     def error(message, color = :red)
       return if quiet?
 

data/lib/berkshelf/uploader.rb

@@ -1,6 +1,12 @@
 module Berkshelf
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Uploader
+    class << self
+      def finalize
+        conn.terminate if conn.alive?
+      end
+    end
+
     extend Forwardable
 
     def_delegator :conn, :client_name
@@ -28,7 +34,9 @@ module Berkshelf
     # @option options [URI, String, Hash] :proxy
     #   URI, String, or Hash of HTTP proxy options
     def initialize(options = {})
-      @conn = Ridley.connection(options)
+      @conn = Ridley.new(options)
+
+      ObjectSpace.define_finalizer(self, self.class.method(:finalize).to_proc)
     end
 
     # Uploads a CachedCookbook from a CookbookStore to this instances Chef Server URL
@@ -51,13 +59,11 @@ module Berkshelf
     # @return [Boolean]
     def upload(cookbook, options = {})
       cookbook.validate! unless options[:skip_syntax_check]
-      mutex     = Mutex.new
       checksums = cookbook.checksums.dup
       sandbox   = conn.sandbox.create(checksums.keys)
 
-      sandbox.multi_upload(checksums)
+      sandbox.upload(checksums)
       sandbox.commit
-      sandbox.terminate
 
       conn.cookbook.save(
         cookbook.cookbook_name,

data/lib/berkshelf/vagrant.rb

@@ -3,7 +3,7 @@ require 'berkshelf'
 require 'berkshelf/vagrant/errors'
 
 module Berkshelf
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   # @author Andrew Garson <andrew.garson@gmail.com>
   module Vagrant
     module Action

data/lib/berkshelf/vagrant/action/clean.rb

@@ -1,7 +1,7 @@
 module Berkshelf
   module Vagrant
     module Action
-      # @author Jamie Winsor <jamie@vialstudios.com>
+      # @author Jamie Winsor <reset@riotgames.com>
       class Clean
         attr_reader :shelf
 

data/lib/berkshelf/vagrant/action/install.rb

@@ -1,7 +1,7 @@
 module Berkshelf
   module Vagrant
     module Action
-      # @author Jamie Winsor <jamie@vialstudios.com>
+      # @author Jamie Winsor <reset@riotgames.com>
       # @author Andrew Garson <andrew.garson@gmail.com>
       class Install
         attr_reader :shelf

data/lib/berkshelf/vagrant/action/set_ui.rb

@@ -1,14 +1,14 @@
 module Berkshelf
   module Vagrant
     module Action
-      # @author Jamie Winsor <jamie@vialstudios.com>
+      # @author Jamie Winsor <reset@riotgames.com>
       class SetUI
         def initialize(app, env)
           @app = app
         end
 
         def call(env)
-          Berkshelf.ui = ::Vagrant::UI::Colored.new("Berkshelf")
+          Berkshelf.ui = ::Vagrant::UI::Colored.new('Berkshelf')
           @app.call(env)
         end
       end

data/lib/berkshelf/vagrant/action/upload.rb

@@ -1,7 +1,7 @@
 module Berkshelf
   module Vagrant
     module Action
-      # @author Jamie Winsor <jamie@vialstudios.com>
+      # @author Jamie Winsor <reset@riotgames.com>
       class Upload
         attr_reader :berksfile
 

data/lib/berkshelf/vagrant/action/validate.rb

@@ -1,7 +1,7 @@
 module Berkshelf
   module Vagrant
     module Action
-      # @author Jamie Winsor <jamie@vialstudios.com>
+      # @author Jamie Winsor <reset@riotgames.com>
       #
       # As of Vagrant 1.0.5 it is not possible to validate configuration values of
       # a configuraiton that was not explicitly described in a Vagrant::Config.run block.

data/lib/berkshelf/vagrant/config.rb

@@ -1,6 +1,6 @@
 module Berkshelf
   module Vagrant
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     # @author Andrew Garson <andrew.garson@gmail.com>
     class Config < ::Vagrant::Config::Base
       # @return [String]

data/lib/berkshelf/vagrant/middleware.rb

@@ -1,6 +1,6 @@
 module Berkshelf
   module Vagrant
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     #
     # Middleware stacks for use with Vagrant
     module Middleware

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.1.6"
+  VERSION = "1.2.0.rc1"
 end

data/lib/thor/monkies/shell.rb

@@ -0,0 +1,8 @@
+require 'berkshelf/ui'
+
+# @author Seth Vargo <sethvargo@gmail.com>
+class ::Thor::Shell::Color
+  # Include the Berkshelf UI methods - this is used by both
+  # Vagrant and Berkshelf UI
+  include ::Berkshelf::UI
+end

data/spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb

@@ -1,6 +1,6 @@
 name             "example_cookbook"
 maintainer       "Josiah Kiehl"
-maintainer_email "josiah@skirmisher.net"
+maintainer_email "jkiehl@riotgames.com"
 license          "DO WHAT YOU WANT CAUSE A PIRATE IS FREE"
 description      "Installs/Configures example_cookbook"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))

data/spec/fixtures/cookbooks/example_cookbook/metadata.rb

@@ -1,5 +1,5 @@
 maintainer       "Josiah Kiehl"
-maintainer_email "josiah@skirmisher.net"
+maintainer_email "jkiehl@riotgames.com"
 license          "DO WHAT YOU WANT CAUSE A PIRATE IS FREE"
 description      "Installs/Configures example_cookbook"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))

data/spec/fixtures/cookbooks/nginx-0.100.5/templates/default/plugins/nginx.rb.erb

@@ -1,5 +1,5 @@
 #
-# Author:: Jamie Winsor (<jamie@vialstudios.com>)
+# Author:: Jamie Winsor (<reset@riotgames.com>)
 #
 # Copyright 2012, Riot Games
 #

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 require 'rubygems'
-
 require 'bundler'
 require 'spork'
-require 'vcr'
 
 Spork.prefork do
   require 'json_spec'
@@ -16,11 +14,6 @@ Spork.prefork do
 
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
-  VCR.configure do |c|
-    c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures', 'vcr_cassettes')
-    c.hook_into :webmock
-  end
-
   RSpec.configure do |config|
     config.include Berkshelf::RSpec::FileSystemMatchers
     config.include JsonSpec::Helpers
@@ -31,20 +24,6 @@ Spork.prefork do
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 
-    config.around do |example|
-      # Dynamically create cassettes based on the name of the example
-      # being run. This creates a new cassette for every test.
-      cur = example.metadata
-      identifiers = [example.metadata[:description_args]]
-      while cur = cur[:example_group] do
-        identifiers << cur[:description_args]
-      end
-
-      VCR.use_cassette(identifiers.reverse.join(' ')) do
-        example.run
-      end
-    end
-
     config.before(:each) do
       clean_tmp_path
       Berkshelf.cookbook_store = Berkshelf::CookbookStore.new(tmp_path.join("downloader_tmp"))
@@ -90,10 +69,91 @@ Spork.prefork do
     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, 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
+      end
+    end
+    path
+  end
+
+  def git_sha_for_tag(repo, tag)
+    Dir.chdir local_git_origin_path_for(repo) do
+      run!("git show-ref '#{tag}'").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
+
   Berkshelf::RSpec::Knife.load_knife_config(File.join(APP_ROOT, 'spec/knife.rb'))
 end
 
 Spork.each_run do
   require 'berkshelf'
   require 'berkshelf/vagrant'
+
+  module Berkshelf
+    class GitLocation
+      alias :real_clone :clone
+      def clone
+        fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
+        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/,'-'))
+        @uri = "file://#{fake_remote}"
+        real_clone
+      end
+    end
+  end
 end
+

data/spec/support/chef_api.rb

@@ -1,7 +1,3 @@
-require 'pathname'
-require 'chef/rest'
-require 'chef/cookbook_version'
-
 module Berkshelf
   module RSpec
     module ChefAPI
@@ -9,7 +5,7 @@ module Berkshelf
       #
       # @return [Array]
       def get_cookbooks
-        rest.get_rest("cookbooks")
+        ridley.cookbook.all
       end
 
       def upload_cookbook(path)
@@ -17,31 +13,30 @@ module Berkshelf
         uploader.upload(cached)
       end
 
-      # Remove all versions of all cookbooks from the Chef Server defined in your
-      # Knife config.
-      def purge_cookbooks
-        get_cookbooks.each do |name, info|
-          info["versions"].each do |version_info|
-            rest.delete_rest("cookbooks/#{name}/#{version_info["version"]}?purge=true")
-          end
-        end
-      end
-
       # Remove the version of the given cookbook from the Chef Server defined
       # in your Knife config.
       #
       # @param [#to_s] name
       # @param [#to_s] version
-      def purge_cookbook(name, version)
-        rest.delete_rest("cookbooks/#{name}/#{version}?purge=true")
-      rescue Net::HTTPServerException => e
-        raise unless e.to_s =~ /^404/
+      def purge_cookbook(name, version = nil)
+        if version.nil?
+          ridley.cookbook.delete_all(name, purge: true)
+        else
+          ridley.cookbook.delete(name, version, purge: true)
+        end
+      rescue Ridley::Errors::HTTPNotFound
+        true
       end
 
-      def server_has_cookbook?(name, version)
-        rest.get_rest("cookbooks/#{name}/#{version}")
-        true
-      rescue Net::HTTPServerException => e
+      def server_has_cookbook?(name, version = nil)
+        versions = ridley.cookbook.versions(name)
+
+        if version.nil?
+          !versions.empty?
+        else
+          !versions.find { |ver| ver == version }.nil?
+        end
+      rescue Ridley::Errors::HTTPNotFound
         false
       end
 
@@ -98,15 +93,21 @@ EOF
 
       private
 
-        def rest
-          quietly { Chef::REST.new(Chef::Config[:chef_server_url]) }
+        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],
+            ssl: { verify: false }
+          )
         end
 
         def uploader
           @uploader ||= Berkshelf::Uploader.new(
-            server_url: Chef::Config[:chef_server_url],
-            client_name: Chef::Config[:node_name],
-            client_key: Chef::Config[:client_key]
+            server_url: Berkshelf::Chef::Config[:chef_server_url],
+            client_name: Berkshelf::Chef::Config[:node_name],
+            client_key: Berkshelf::Chef::Config[:client_key],
+            ssl: { verify: false }
           )
         end
     end