berkshelf 0.6.0.beta3 → 0.6.0.beta4

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p194
+1.9.3-p286

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
 matrix:
   allow_failures:
     - rvm: 1.9.2
-script: 'bundle exec thor ci'
+script: 'bundle exec thor spec:ci'

data/Gemfile

@@ -1,3 +1,46 @@
 source :rubygems
 
 gemspec
+
+group :development do
+  gem 'yard'
+  gem 'spork'
+  gem 'guard', '>= 1.5.0'
+  gem 'guard-yard'
+  gem 'guard-rspec'
+  gem 'guard-spork'
+  gem 'guard-cucumber'
+  gem 'coolline'
+  gem 'redcarpet'
+
+  require 'rbconfig'
+
+  if RbConfig::CONFIG['target_os'] =~ /darwin/i
+    gem 'growl', require: false
+    gem 'rb-fsevent', require: false
+
+    if `uname`.strip == 'Darwin' && `sw_vers -productVersion`.strip >= '10.8'
+      gem 'terminal-notifier-guard', '~> 1.5.3', require: false
+    end rescue Errno::ENOENT
+
+  elsif RbConfig::CONFIG['target_os'] =~ /linux/i
+    gem 'libnotify',  '~> 0.8.0', require: false
+    gem 'rb-inotify', require: false
+
+  elsif RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+    gem 'win32console', require: false
+    gem 'rb-notifu', '>= 0.0.4', require: false
+    gem 'wdm', require: false
+  end
+end
+
+group :test do
+  gem 'thor'
+  gem 'rake', '>= 0.9.2.2'
+  gem 'rspec'
+  gem 'fuubar'
+  gem 'json_spec'
+  gem 'webmock'
+  gem 'vcr'
+  gem 'aruba'
+end

data/Guardfile

@@ -1,5 +1,4 @@
 notification :off
-interactor :coolline
 
 guard 'spork' do
   watch('Gemfile')

data/LICENSE

@@ -1,7 +1,7 @@
 Author:: Jamie Winsor (<jamie@vialstudios.com>)
 Author:: Josiah Kiehl (<josiah@skirmisher.net>)
 Author:: Michael Ivey (<ivey@gweezlebur.com>)
-Author:: Erik Hollensbe (<erik@hollensbe.org>)
+Author:: Justin Campbell (<justin@justincampbell.me>)
 
 Copyright 2012 Riot Games
 

data/README.md

@@ -44,9 +44,11 @@ server, so be sure to configure a server safe for this task.
 See [here](https://github.com/tdegrunt/vagrant-chef-server-bootstrap) for a
 quick way to get a testing chef server up.
 
-# Authors and Contributors
+# Authors
 
-* Josiah Kiehl (<josiah@skirmisher.net>)
 * Jamie Winsor (<jamie@vialstudios.com>)
-* Erik Hollensbe (<erik@hollensbe.org>)
+* Josiah Kiehl (<josiah@skirmisher.net>)
 * Michael Ivey (<ivey@gweezlebur.com>)
+* Justin Campbell (<justin@justincampbell.me>)
+
+Thank you to all of our [Contributors](https://github.com/RiotGames/berkshelf/graphs/contributors), testers, and users.

data/Thorfile

@@ -8,43 +8,61 @@ require 'berkshelf'
 require 'thor/rake_compat'
 
 class Default < Thor
-  include Thor::RakeCompat
-  Bundler::GemHelper.install_tasks
+  class Gem < Thor
+    include Thor::RakeCompat
+    Bundler::GemHelper.install_tasks
 
-  desc "build", "Build berkshelf-#{Berkshelf::VERSION}.gem into the pkg directory"
-  def build
-    Rake::Task["build"].execute
-  end
+    namespace :gem
 
-  desc "install", "Build and install berkshelf-#{Berkshelf::VERSION}.gem into system gems"
-  def install
-    Rake::Task["install"].execute
-  end
+    desc "build", "Build berkshelf-#{Berkshelf::VERSION}.gem into the pkg directory"
+    def build
+      Rake::Task["build"].execute
+    end
 
-  desc "release", "Create tag v#{Berkshelf::VERSION} and build and push berkshelf-#{Berkshelf::VERSION}.gem to Rubygems"
-  def release
-    Rake::Task["release"].execute
-  end
+    desc "release", "Create tag v#{Berkshelf::VERSION} and build and push berkshelf-#{Berkshelf::VERSION}.gem to Rubygems"
+    def release
+      Rake::Task["release"].execute
+    end
 
-  desc "spec", "Run RSpec code examples"
-  def spec
-    exec "rspec --color --format=documentation spec"
+    desc "install", "Build and install berkshelf-#{Berkshelf::VERSION}.gem into system gems"
+    def install
+      Rake::Task["install"].execute
+    end
   end
 
-  desc "cucumber", "Run Cucumber features"
-  def cucumber
-    exec "cucumber --color --format progress --tags ~@no_run"
-  end
+  class Spec < Thor
+    include Thor::Actions
+
+    namespace :spec
+    default_task :all
 
-  desc "ci", "Run all test suites"
-  def ci
-    ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
-    exec "rspec --tag ~chef_server --tag ~focus spec &&
-          cucumber --format progress --tags ~@chef_server"
+    desc "all", "Run all tests"
+    def all
+      invoke(:unit)
+      invoke(:acceptance)
+    end
+
+    desc "ci", "Run all possible tests on Travis-CI"
+    def ci
+      ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
+      run "rspec --tag ~chef_server --tag ~focus --color --format=documentation spec"
+      run "cucumber --format pretty --tags ~@chef_server"
+    end
+
+    desc "unit", "Run unit tests"
+    def unit
+      run "rspec --color --format=documentation spec"
+    end
+
+    desc "acceptance", "Run acceptance tests"
+    def acceptance
+      run "cucumber --color --format pretty --tags ~@no_run"
+    end
   end
 
   class VCR < Thor
     namespace :vcr
+    default_task :clean
 
     desc "clean", "clean VCR cassettes"
     def clean

data/berkshelf.gemspec

@@ -1,13 +1,23 @@
 # -*- encoding: utf-8; mode: ruby -*-
-
 require File.expand_path('../lib/berkshelf/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.authors               = ["Josiah Kiehl", "Jamie Winsor", "Michael Ivey", "Erik Hollensbe"]
-  s.email                 = ["josiah@skirmisher.net", "jamie@vialstudios.com", "ivey@gweezlebur.com", "erik@hollensbe.org"]
+  s.authors               = [
+    "Jamie Winsor",
+    "Josiah Kiehl",
+    "Michael Ivey",
+    "Justin Campbell"
+  ]
+  s.email                 = [
+    "jamie@vialstudios.com",
+    "josiah@skirmisher.net",
+    "ivey@gweezlebur.com",
+    "justin@justincampbell.me"
+  ]
+
   s.description           = %q{Manages a Cookbook's, or an Application's, Cookbook dependencies}
   s.summary               = s.description
-  s.homepage              = "https://github.com/RiotGames/berkshelf"
+  s.homepage              = "http://berkshelf.com"
   s.files                 = `git ls-files`.split($\)
   s.executables           = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files            = s.files.grep(%r{^(test|spec|features)/})
@@ -17,33 +27,14 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.1"
 
   s.add_runtime_dependency 'chozo', '>= 0.1.0'
-  s.add_runtime_dependency 'ridley',  '>= 0.0.5'
-  s.add_runtime_dependency 'solve',   '>= 0.4.0.rc1'
-  s.add_runtime_dependency 'chef',    '~> 10.12'
+  s.add_runtime_dependency 'ridley', '>= 0.0.5'
+  s.add_runtime_dependency 'solve', '>= 0.4.0.rc1'
+  s.add_runtime_dependency 'chef', '~> 10.12'
   s.add_runtime_dependency 'minitar'
-  s.add_runtime_dependency 'thor',    '~> 0.16.0'
+  s.add_runtime_dependency 'thor', '~> 0.16.0'
   s.add_runtime_dependency 'vagrant', '~> 1.0.5'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'multi_json'
   s.add_runtime_dependency 'hashie'
   s.add_runtime_dependency 'activemodel'
-
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'cucumber'
-  s.add_development_dependency 'vcr'
-  s.add_development_dependency 'webmock'
-  s.add_development_dependency 'aruba'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'json_spec'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'fuubar'
-  s.add_development_dependency 'spork'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-cucumber'
-  s.add_development_dependency 'guard-spork'
-  s.add_development_dependency 'guard-yard'
-  s.add_development_dependency 'coolline'
-  s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
 end

data/lib/berkshelf/berksfile.rb

@@ -34,7 +34,10 @@ module Berkshelf
         cookbooks.each do |cb|
           dest = File.join(scratch, cb.cookbook_name, "/")
           FileUtils.mkdir_p(dest)
-          FileUtils.cp_r(Dir.glob(File.join(cb.path, "*")), dest)
+
+          # Dir.glob does not support backslash as a File separator
+          src = cb.path.to_s.gsub('\\', '/')
+          FileUtils.cp_r(Dir.glob(File.join(src, "*")), dest)
         end
 
         FileUtils.remove_dir(path, force: true)

data/lib/berkshelf/cli.rb

@@ -131,8 +131,32 @@ module Berkshelf
       )
     end
 
+    method_option :foodcritic,
+      type: :boolean,
+      desc: "Creates a Thorfile with Foodcritic support to lint test your cookbook"
+    method_option :scmversion,
+      type: :boolean,
+      desc: "Creates a Thorfile with SCMVersion support to manage versions for continuous integration"
+    method_option :no_bundler,
+      type: :boolean,
+      desc: "Skips generation of a Gemfile and other Bundler specific support"
+    method_option :vagrant,
+      type: :boolean,
+      hide: true
+    method_option :skip_vagrant,
+      type: :boolean,
+      desc: "Skips adding a Vagrantfile and adding supporting gems to the Gemfile"
+    method_option :git,
+      type: :boolean,
+      hide: true
+    method_option :skip_git,
+      type: :boolean,
+      desc: "Skips adding a .gitignore and running git init in the cookbook directory"
     desc "init [PATH]", "Prepare a local path to have its Cookbook dependencies managed by Berkshelf."
     def init(path = Dir.pwd)
+      Berkshelf.formatter.deprecation "--git is now the default" if options[:git]
+      Berkshelf.formatter.deprecation "--vagrant is now the default" if options[:vagrant]
+
       if File.chef_cookbook?(path)
         options[:chefignore] = true
         options[:metadata_entry] = true
@@ -184,7 +208,6 @@ module Berkshelf
     method_option :skip_git,
       type: :boolean,
       desc: "Skips adding a .gitignore and running git init in the cookbook directory"
-
     desc "cookbook NAME", "Create a skeleton for a new cookbook"
     def cookbook(name)
       Berkshelf.formatter.deprecation "--git is now the default" if options[:git]

data/lib/berkshelf/core_ext/file_utils.rb

@@ -27,7 +27,7 @@ module FileUtils
     # @param [Hash] options
     #   @see {FileUtils::mv}
     def safe_mv(src, dest, options = {})
-      FileUtils.mv(src, dest, options)
+      FileUtils.old_mv(src, dest, options)
     rescue Errno::EACCES
       FileUtils.cp_r(src, dest)
       FileUtils.rm_rf(src)

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.6.0.beta3"
+  VERSION = "0.6.0.beta4"
 end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'vcr'
 
 Spork.prefork do
   require 'rspec'
-  require 'simplecov'
   require 'pp'
   require 'json_spec'
   require 'webmock/rspec'
@@ -54,10 +53,6 @@ Spork.prefork do
     end
   end
 
-  SimpleCov.start do
-    add_filter 'spec/'
-  end
-
   def capture(stream)
     begin
       stream = stream.to_s

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta3
+  version: 0.6.0.beta4
   prerelease: 6
 platform: ruby
 authors:
-- Josiah Kiehl
 - Jamie Winsor
+- Josiah Kiehl
 - Michael Ivey
-- Erik Hollensbe
+- Justin Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chozo
@@ -190,300 +190,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json_spec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: spork
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-spork
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coolline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
-- josiah@skirmisher.net
 - jamie@vialstudios.com
+- josiah@skirmisher.net
 - ivey@gweezlebur.com
-- erik@hollensbe.org
+- justin@justincampbell.me
 executables:
 - berks
 extensions: []
@@ -629,7 +341,7 @@ files:
 - spec/unit/berkshelf/resolver_spec.rb
 - spec/unit/berkshelf/uploader_spec.rb
 - spec/unit/berkshelf_spec.rb
-homepage: https://github.com/RiotGames/berkshelf
+homepage: http://berkshelf.com
 licenses: []
 post_install_message: 
 rdoc_options: []