berkshelf 0.4.0.rc1 → 0.4.0.rc2

data/spec/unit/berkshelf/git_spec.rb

@@ -65,37 +65,37 @@ module Berkshelf
       describe "::validate_uri" do
         context "given a valid Git read-only URI" do
           it "returns true" do
-            subject.validate_uri(readonly_uri)
+            subject.validate_uri(readonly_uri).should be_true
           end
         end
 
         context "given a valid Git HTTPS URI" do
           it "returns true" do
-            subject.validate_uri(https_uri)
+            subject.validate_uri(https_uri).should be_true
           end
         end
 
         context "given a valid Git SSH URI" do
           it "returns true" do
-            subject.validate_uri(ssh_uri)
+            subject.validate_uri(ssh_uri).should be_true
           end
         end
 
         context "given an invalid URI" do
           it "returns false" do
-            subject.validate_uri(invalid_uri)
+            subject.validate_uri(invalid_uri).should be_false
           end
         end
 
         context "given a HTTP URI" do
           it "returns false" do
-            subject.validate_uri(http_uri)
+            subject.validate_uri(http_uri).should be_false
           end
         end
 
         context "given an integer" do
           it "returns false" do
-            subject.validate_uri(123)
+            subject.validate_uri(123).should be_false
           end
         end
       end
@@ -103,19 +103,19 @@ module Berkshelf
       describe "::validate_uri!" do
         context "given a valid Git read-only URI" do
           it "returns true" do
-            subject.validate_uri!(readonly_uri)
+            subject.validate_uri!(readonly_uri).should be_true
           end
         end
 
         context "given a valid Git HTTPS URI" do
           it "returns true" do
-            subject.validate_uri!(https_uri)
+            subject.validate_uri!(https_uri).should be_true
           end
         end
 
         context "given a valid Git SSH URI" do
           it "returns true" do
-            subject.validate_uri!(ssh_uri)
+            subject.validate_uri!(ssh_uri).should be_true
           end
         end
 

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -4,17 +4,20 @@ module Berkshelf
   describe InitGenerator do
     subject { InitGenerator }
 
-    let(:target_root) { tmp_path.join("some_cookbook") }
+    let(:target) { tmp_path.join("some_cookbook") }
 
     context "with default options" do
       before do
-        generator = subject.new([target_root])
+        generator = subject.new([target])
         capture(:stdout) { generator.invoke_all }
       end
 
       specify do
-        target_root.should have_structure {
+        target.should have_structure {
           file "Berksfile"
+          file "Gemfile" do
+            contains "gem 'berkshelf'"
+          end
           no_file "chefignore"
         }
       end
@@ -22,12 +25,12 @@ module Berkshelf
 
     context "with a chefignore" do
       before do
-        generator = subject.new([target_root], chefignore: true)
+        generator = subject.new([target], chefignore: true)
         capture(:stdout) { generator.invoke_all }
       end
 
       specify do
-        target_root.should have_structure {
+        target.should have_structure {
           file "Berksfile"
           file "chefignore"
         }
@@ -36,17 +39,114 @@ module Berkshelf
 
     context "with a metadata entry in the Berksfile" do
       before do
-        generator = subject.new([target_root], metadata_entry: true)
+        generator = subject.new([target], metadata_entry: true)
         capture(:stdout) { generator.invoke_all }
       end
 
       specify do
-        target_root.should have_structure {
+        target.should have_structure {
           file "Berksfile" do
             contains "metadata"
           end
         }
       end
     end
+
+    context "with the vagrant option true" do
+      before do
+        generator = subject.new([target], vagrant: true)
+        quietly { generator.invoke_all }
+      end
+
+      specify do
+        target.should have_structure {
+          file "Vagrantfile" do
+            contains "recipe[some_cookbook::default]"
+          end
+          file "Gemfile" do
+            contains "gem 'vagrant'"
+          end
+          directory "cookbooks"
+        }
+      end
+    end
+
+    context "with the git option true" do
+      before do
+        generator = subject.new([target], git: true)
+        capture(:stdout) { generator.invoke_all }
+      end
+
+      specify do
+        target.should have_structure {
+          file ".gitignore"
+        }
+      end
+    end
+
+    context "with the foodcritic option true" do
+      before do
+        generator = subject.new([target], foodcritic: true)
+        capture(:stdout) { generator.invoke_all }
+      end
+
+      specify do
+        target.should have_structure {
+          file "Thorfile" do
+            contains "require 'thor/foodcritic'"
+          end
+          file "Gemfile" do
+            contains "gem 'thor-foodcritic'"
+          end
+        }
+      end
+    end
+
+    context "with the scmversion option true" do
+      before do
+        generator = subject.new([target], scmversion: true)
+        capture(:stdout) { generator.invoke_all }
+      end
+
+      specify do
+        target.should have_structure {
+          file "Thorfile" do
+            contains "require 'thor/scmversion'"
+          end
+          file "Gemfile" do
+            contains "gem 'thor-scmversion'"
+          end
+        }
+      end
+    end
+
+    context "with the bundler option true" do
+      before do
+        generator = subject.new([target], no_bundler: true)
+        capture(:stdout) { generator.invoke_all }
+      end
+
+      specify do
+        target.should have_structure {
+          no_file "Gemfile"
+        }
+      end
+    end
+
+    context "given a value for the cookbook_name option" do
+      it "sets the value of cookbook_name attribute to the specified option" do
+        generator = subject.new([target], cookbook_name: "nautilus")
+
+        generator.send(:cookbook_name).should eql("nautilus")
+      end
+    end
+
+    context "when no value for cookbook_name option is specified" do
+      it "infers the name of the cookbook from the directory name" do
+        generator = subject.new([target])
+
+        generator.send(:cookbook_name).should eql("some_cookbook")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
+  version: 0.4.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solve
@@ -370,6 +370,7 @@ files:
 - Thorfile
 - berkshelf.gemspec
 - bin/berks
+- features/cookbook_command.feature
 - features/init_command.feature
 - features/install.feature
 - features/lockfile.feature
@@ -382,9 +383,11 @@ files:
 - features/upload_command.feature
 - features/without.feature
 - lib/berkshelf.rb
+- lib/berkshelf/base_generator.rb
 - lib/berkshelf/berksfile.rb
 - lib/berkshelf/cached_cookbook.rb
 - lib/berkshelf/cli.rb
+- lib/berkshelf/cookbook_generator.rb
 - lib/berkshelf/cookbook_source.rb
 - lib/berkshelf/cookbook_source/chef_api_location.rb
 - lib/berkshelf/cookbook_source/git_location.rb
@@ -402,7 +405,19 @@ files:
 - lib/berkshelf/dsl.rb
 - lib/berkshelf/errors.rb
 - lib/berkshelf/generator_files/Berksfile.erb
+- lib/berkshelf/generator_files/Gemfile.erb
+- lib/berkshelf/generator_files/README.md.erb
+- lib/berkshelf/generator_files/Thorfile.erb
+- lib/berkshelf/generator_files/Vagrantfile.erb
 - lib/berkshelf/generator_files/chefignore
+- lib/berkshelf/generator_files/default_recipe.erb
+- lib/berkshelf/generator_files/gitignore.erb
+- lib/berkshelf/generator_files/licenses/apachev2.erb
+- lib/berkshelf/generator_files/licenses/gplv2.erb
+- lib/berkshelf/generator_files/licenses/gplv3.erb
+- lib/berkshelf/generator_files/licenses/mit.erb
+- lib/berkshelf/generator_files/licenses/reserved.erb
+- lib/berkshelf/generator_files/metadata.rb.erb
 - lib/berkshelf/git.rb
 - lib/berkshelf/init_generator.rb
 - lib/berkshelf/lockfile.rb
@@ -445,6 +460,7 @@ files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_source/chef_api_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/git_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/location_spec.rb
@@ -487,6 +503,7 @@ signing_key:
 specification_version: 3
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
+- features/cookbook_command.feature
 - features/init_command.feature
 - features/install.feature
 - features/lockfile.feature
@@ -531,6 +548,7 @@ test_files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_source/chef_api_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/git_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/location_spec.rb