berkshelf 1.1.0 → 1.1.1

data/.travis.yml

@@ -6,4 +6,10 @@ matrix:
   allow_failures:
     - rvm: 1.9.2
     - rvm: ruby-head
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#berkshelf"
+    skip_join: true
+    use_notice: true
 script: 'bundle exec thor spec:ci'

data/CONTRIBUTING.md

@@ -0,0 +1,31 @@
+# Contributing
+
+## Running tests
+
+### Install prerequisites
+
+Install the latest version of [Bundler](http://gembundler.com)
+
+    $ gem install bundler
+
+Clone the project
+
+    $ git clone git://github.com/RiotGames/berkshelf.git
+
+and run:
+
+    $ cd berkshelf
+    $ bundle install
+
+Bundler will install all gems and their dependencies required for testing and developing.
+
+### Running unit (RSpec) and acceptance (Cucumber) tests
+
+Simply copy the `spec/knife.rb.sample` to `spec/knife.rb`, and point it at a
+chef server. Berkshelf tests may upload and destroy cookbooks on your chef
+server, so be sure to configure a server safe for this task.
+
+    $ bundle exec guard start
+
+See [here](https://github.com/tdegrunt/vagrant-chef-server-bootstrap) for a
+quick way to get a testing chef server up.

data/README.md

@@ -12,38 +12,6 @@ Manage a Cookbook or an Application's Cookbook dependencies
 
 See [berkshelf.com](http://berkshelf.com) for up-to-date usage instructions.
 
-# Contributing
-
-## Running tests
-
-### Install prerequisites
-
-Install the latest version of [Bundler](http://gembundler.com)
-
-    $ gem install bundler
-
-Clone the project
-
-    $ git clone git://github.com/RiotGames/berkshelf.git
-
-and run:
-
-    $ cd berkshelf
-    $ bundle install
-
-Bundler will install all gems and their dependencies required for testing and developing.
-
-### Running unit (RSpec) and acceptance (Cucumber) tests
-
-Simply copy the `spec/knife.rb.sample` to `spec/knife.rb`, and point it at a
-chef server. Berkshelf tests may upload and destroy cookbooks on your chef
-server, so be sure to configure a server safe for this task.
-
-    $ bundle exec guard start
-
-See [here](https://github.com/tdegrunt/vagrant-chef-server-bootstrap) for a
-quick way to get a testing chef server up.
-
 # Authors
 
 * Jamie Winsor (<jamie@vialstudios.com>)

data/berkshelf.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'yajl-ruby'
   s.add_dependency 'activesupport'
   s.add_dependency 'chef', '>= 10.16.2'
-  s.add_dependency 'ridley', '>= 0.4.1'
+  s.add_dependency 'ridley', '>= 0.6.2'
   s.add_dependency 'chozo', '>= 0.2.3'
   s.add_dependency 'hashie'
   s.add_dependency 'minitar'

data/generator_files/chefignore

@@ -1,12 +1,21 @@
-# Put files/directories that should be ignored in this file.
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
 # Lines that start with '# ' are comments.
 
-## OS
+# OS generated files #
+######################
 .DS_Store
 Icon?
 nohup.out
+ehthumbs.db
+Thumbs.db
 
-## EDITORS
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
 \#*
 .#*
 *~
@@ -22,31 +31,66 @@ tmtags
 .settings
 mkmf.log
 
-## COMPILED
+## COMPILED ##
+##############
 a.out
 *.o
 *.pyc
 *.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
 
-## OTHER SCM
-*/.bzr/*
-*/.hg/*
-*/.svn/*
-
-## Don't send rspecs up in cookbook
+# Testing #
+###########
 .watchr
 .rspec
 spec/*
 spec/fixtures/*
+test/*
 features/*
+Guardfile
+Procfile
 
-## SCM
+# SCM #
+#######
+.git
+*/.git
 .gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
 
-# Berkshelf
+# Berkshelf #
+#############
 Berksfile
 Berksfile.lock
 cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
 
-# Vagrant
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
 .vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml

data/lib/berkshelf/berksfile.rb

@@ -82,7 +82,7 @@ module Berkshelf
       @cached_cookbooks = nil
     end
 
-    # Add a cookbook source to the Berksfile to be retrieved and have it's dependencies recurisvely retrieved
+    # Add a cookbook source to the Berksfile to be retrieved and have it's dependencies recursively retrieved
     # and resolved.
     #
     # @example a cookbook source that will be retrieved from one of the default locations
@@ -468,7 +468,6 @@ module Berkshelf
     #   group to be installed and all others to be ignored
     # @option cookbooks [String, Array] :cookbooks
     #   Names of the cookbooks to retrieve sources for
-    # @option options [Integer] :thread_count
     # @option options [Hash] :params
     #   URI query unencoded key/value pairs
     # @option options [Hash] :headers

data/lib/berkshelf/cli.rb

@@ -183,6 +183,11 @@ module Berkshelf
       type: :boolean,
       default: nil,
       desc: "Disable/Enable SSL verification when uploading cookbooks"
+    option :skip_syntax_check,
+      type: :boolean,
+      default: false,
+      desc: "Skip Ruby syntax check when uploading cookbooks",
+      aliases: "-s"
     desc "upload [COOKBOOKS]", "Upload cookbook(s) specified by a Berksfile to the configured Chef Server."
     def upload(*cookbook_names)
       berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])

data/lib/berkshelf/git.rb

@@ -4,8 +4,9 @@ require 'mixlib/shellout'
 module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
   class Git
-    GIT_REGEXP = URI.regexp(%w{ https git }).freeze
-    SSH_REGEXP = /(.+)@(.+):(.+)\.git/.freeze
+    GIT_REGEXP = URI.regexp(%w(http https ssh git+ssh git rsync))
+    SCP_REGEXP = /^(.+@)?[\w\d\.-]+:.*$/
+
     HAS_QUOTE_RE = %r{\"}.freeze
     HAS_SPACE_RE = %r{\s}.freeze
 
@@ -99,15 +100,16 @@ module Berkshelf
       #
       # @return [Boolean]
       def validate_uri(uri)
+
         unless uri.is_a?(String)
           return false
         end
 
-        unless uri.slice(SSH_REGEXP).nil?
+        unless uri.slice(GIT_REGEXP).nil?
           return true
         end
 
-        unless uri.slice(GIT_REGEXP).nil?
+        unless uri.slice(SCP_REGEXP).nil?
           return true
         end
 

data/lib/berkshelf/uploader.rb

@@ -17,7 +17,6 @@ module Berkshelf
     # @option options [String] :organization
     #   the Organization to connect to. This is only used if you are connecting to
     #   private Chef or hosted Chef
-    # @option options [Integer] :thread_count
     # @option options [Hash] :params
     #   URI query unencoded key/value pairs
     # @option options [Hash] :headers
@@ -43,26 +42,23 @@ module Berkshelf
     # @option options [Boolean] :freeze
     #   Freeze the uploaded Cookbook on the Chef Server so that it cannot be
     #   overwritten
+    # @option options [Boolean] :skip_syntax_check
+    #   Skip syntax checking of the Cookbook to reduce the overall upload time 
     #
     # @raise [CookbookNotFound]
     # @raise [CookbookSyntaxError]
     #
     # @return [Boolean]
     def upload(cookbook, options = {})
-      cookbook.validate!
+      cookbook.validate! unless options[:skip_syntax_check]
       mutex     = Mutex.new
       checksums = cookbook.checksums.dup
       sandbox   = conn.sandbox.create(checksums.keys)
 
-      conn.thread_count.times.collect do
-        Thread.new(conn, sandbox, checksums.to_a) do |conn, sandbox, checksums|
-          while checksum = mutex.synchronize { checksums.pop }
-            sandbox.upload(checksum[0], checksum[1])
-          end
-        end
-      end.each(&:join)
-
+      sandbox.multi_upload(checksums)
       sandbox.commit
+      sandbox.terminate
+
       conn.cookbook.save(
         cookbook.cookbook_name,
         cookbook.version,

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/unit/berkshelf/git_spec.rb

@@ -85,6 +85,36 @@ describe Berkshelf::Git do
         end
       end
 
+      context "given a valid git+ssh URI without an username" do
+        it "returns true" do
+          subject.validate_uri("git+ssh://host.com/repo").should be_true
+        end
+      end
+
+      context "given a valid git+ssh URI with an username" do
+        it "returns true" do
+          subject.validate_uri("git+ssh://user@host.com/repo").should be_true
+        end
+      end
+
+      context "given a valid URI with a dash in the hostname" do
+        it "returns true" do
+          subject.validate_uri("git://user@git-host.com/repo").should be_true
+        end
+      end
+
+      context "given a valid URI with host being a subdomain" do
+        it "returns true" do
+          subject.validate_uri("git://user@git.host.com/repo").should be_true
+        end
+      end
+
+      context "given a valid git+ssh URI with home directory expansion" do
+        it "returns true" do
+          subject.validate_uri("git+ssh://user@host.com/~repo").should be_true
+        end
+      end
+
       context "given an invalid URI" do
         it "returns false" do
           subject.validate_uri(invalid_uri).should be_false
@@ -92,8 +122,8 @@ describe Berkshelf::Git do
       end
 
       context "given a HTTP URI" do
-        it "returns false" do
-          subject.validate_uri(http_uri).should be_false
+        it "returns true" do
+          subject.validate_uri(http_uri).should be_true
         end
       end
 
@@ -139,9 +169,7 @@ describe Berkshelf::Git do
 
       context "given a HTTP URI" do
         it "raises InvalidGitURI" do
-          lambda {
-            subject.validate_uri!(http_uri)
-          }.should raise_error(Berkshelf::InvalidGitURI)
+          subject.validate_uri!(http_uri).should be_true
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -69,7 +69,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: chozo
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ files:
 - .rbenv-version
 - .rvmrc
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -368,10 +369,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 810514310070508080
+      hash: -2262003520386136890
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies