berkshelf 0.4.0.rc1 → 0.4.0.rc2

data/lib/berkshelf/cookbook_source/git_location.rb

@@ -52,6 +52,7 @@ module Berkshelf
         end
 
         cb_path = File.join(destination, "#{self.name}-#{Git.rev_parse(tmp_clone)}")
+        FileUtils.rm_rf(cb_path)
         FileUtils.mv(tmp_clone, cb_path, force: true)
                 
         cached = CachedCookbook.from_store_path(cb_path)

data/lib/berkshelf/dsl.rb

@@ -15,7 +15,7 @@ module Berkshelf
     end
 
     def metadata(options = {})
-      path = options[:path] || File.expand_path('.')
+      path = options[:path] || File.dirname(filepath)
 
       metadata_file = Berkshelf.find_metadata(path)
 
@@ -35,5 +35,11 @@ module Berkshelf
       source = CookbookSource.new(name, path: File.dirname(metadata_file))
       add_source(source)
     end
+
+    private
+
+      def filepath
+        File.join(File.expand_path('.'), "DSLFile")
+      end
   end
 end

data/lib/berkshelf/generator_files/Gemfile.erb

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gem 'berkshelf'
+<% if options[:foodcritic] -%>
+gem 'thor-foodcritic'
+<% end -%>
+<% if options[:scmversion] -%>
+gem 'thor-scmversion'
+<% end -%>
+<% if options[:vagrant] -%>
+gem 'vagrant', '~> 1.0.3'
+<% end -%>

data/lib/berkshelf/generator_files/README.md.erb

@@ -0,0 +1,13 @@
+# <%= name %> cookbook
+
+# Requirements
+
+# Usage
+
+# Attributes
+
+# Recipes
+
+# Author
+
+Author:: <%= maintainer %> (<<%= maintainer_email %>>)

data/lib/berkshelf/generator_files/Thorfile.erb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+require 'bundler'
+require 'bundler/setup'
+<% if options[:foodcritic] -%>
+require 'thor/foodcritic'
+<% end -%>
+<% if options[:scmversion] -%>
+require 'thor/scmversion'
+<% end -%>
+require 'berkshelf/thor'

data/lib/berkshelf/generator_files/Vagrantfile.erb

@@ -0,0 +1,63 @@
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  config.vm.host_name = "<%= cookbook_name %>-berkshelf"
+
+  # CentOS 6.3
+  config.vm.box = "Berkshelf-CentOS-6.3-x86_64-minimal"
+  config.vm.box_url = "https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  config.vm.network :hostonly, "33.33.33.10"
+
+  # Assign this VM to a bridged network, allowing you to connect directly to a
+  # network using the host's network device. This makes the VM appear as another
+  # physical device on your network.
+  # config.vm.network :bridged
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+  config.ssh.max_tries = 40
+  config.ssh.timeout   = 120
+
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path = ["cookbooks"]
+    
+    chef.json = {
+      :mysql => {
+        :server_root_password => 'rootpass',
+        :server_debian_password => 'debpass',
+        :server_repl_password => 'replpass'
+      }
+    }
+
+    chef.run_list = [
+      "recipe[<%= cookbook_name %>::default]"
+    ]
+  end
+
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = 'https://api.opscode.com/organizations/vialstudios'
+  #   chef.validation_client_name = 'vialstudios-validator'
+  #   chef.validation_key_path = '/Users/reset/.chef/vialstudios-validator.pem'
+  #
+  #   chef.run_list = [
+  #     "recipe[<%= cookbook_name %>::default]"
+  #   ]
+  # end
+end

data/lib/berkshelf/generator_files/chefignore

@@ -46,3 +46,4 @@ features/*
 # Berkshelf
 Berksfile
 Berksfile.lock
+cookbooks/*

data/lib/berkshelf/generator_files/default_recipe.erb

@@ -0,0 +1,6 @@
+#
+# Cookbook Name:: <%= name %>
+# Recipe:: default
+#
+<%= commented(license) %>
+#

data/lib/berkshelf/generator_files/gitignore.erb

@@ -0,0 +1,6 @@
+Berksfile.lock
+Gemfile.lock
+/cookbooks
+<% if options[:scmversion] -%>
+VERSION
+<% end -%>

data/lib/berkshelf/generator_files/licenses/apachev2.erb

@@ -0,0 +1,13 @@
+Copyright (C) <%= copyright_year %> <%= maintainer %>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/lib/berkshelf/generator_files/licenses/gplv2.erb

@@ -0,0 +1,15 @@
+Copyright (C) <%= copyright_year %> <%= maintainer %>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

data/lib/berkshelf/generator_files/licenses/gplv3.erb

@@ -0,0 +1,14 @@
+Copyright (C) <%= copyright_year %> <%= maintainer %>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/lib/berkshelf/generator_files/licenses/mit.erb

@@ -0,0 +1,20 @@
+Copyright (C) <%= copyright_year %> <%= maintainer %>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/berkshelf/generator_files/licenses/reserved.erb

@@ -0,0 +1,3 @@
+Copyright (C) <%= copyright_year %> <%= maintainer %>
+
+All rights reserved - Do Not Redistribute

data/lib/berkshelf/generator_files/metadata.rb.erb

@@ -0,0 +1,12 @@
+name             "<%= name %>"
+maintainer       "<%= maintainer %>"
+maintainer_email "<%= maintainer_email %>"
+license          "<%= license_name %>"
+description      "Installs/Configures <%= name %>"
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+<% if options[:scmversion] -%>
+version          IO.read(File.join(File.dirname(__FILE__), 'VERSION')) rescue "0.0.1"
+<% else -%>
+version          "0.0.1"
+<% end -%>
+

data/lib/berkshelf/init_generator.rb

@@ -1,15 +1,12 @@
-require 'thor/group'
-
 module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class InitGenerator < Thor::Group
-    class << self
-      def source_root
-        File.expand_path(File.join(File.dirname(__FILE__), "generator_files"))
+  class InitGenerator < BaseGenerator
+    def initialize(*)
+      super
+      if @options[:cookbook_name]
+        @cookbook_name = @options[:cookbook_name]
       end
     end
-    
-    include Thor::Actions
 
     argument :path,
       type: :string,
@@ -23,14 +20,74 @@ module Berkshelf
       type: :boolean,
       default: false
 
-    def generate
-      target_path = File.expand_path(path)
+    class_option :vagrant,
+      type: :boolean,
+      default: false
+
+    class_option :git,
+      type: :boolean,
+      default: false
+
+    class_option :foodcritic,
+      type: :boolean,
+      default: false
+
+    class_option :scmversion,
+      type: :boolean,
+      default: false
+
+    class_option :no_bundler,
+      type: :boolean,
+      default: false
 
-      template "Berksfile.erb", File.join(target_path, "Berksfile")
+    class_option :cookbook_name,
+      type: :string
+
+    def generate
+      template "Berksfile.erb", target.join("Berksfile")
 
       if options[:chefignore]
-        copy_file "chefignore", File.join(target_path, "chefignore")
+        copy_file "chefignore", target.join("chefignore")
+      end
+
+      if options[:git] || options[:scmversion]
+        template "gitignore.erb", target.join(".gitignore")
+        unless File.exists?(target.join(".git"))
+          inside target do
+            run "git init"
+          end
+        end
+      end
+
+      if options[:foodcritic] || options[:scmversion]
+        template "Thorfile.erb", target.join("Thorfile")
+      end
+
+      if options[:scmversion]
+        create_file target.join("VERSION"), "0.0.1"
+      end
+
+      unless options[:no_bundler]
+        template "Gemfile.erb", target.join("Gemfile")
+      end
+
+      if options[:vagrant]
+        template "Vagrantfile.erb", target.join("Vagrantfile")
+        ::Berkshelf::Cli.new([], berksfile: target.join("Berksfile"), shims: target.join("cookbooks")).invoke(:install)
       end
     end
+
+    private
+
+      def cookbook_name
+        @cookbook_name ||= begin
+          metadata = Chef::Cookbook::Metadata.new
+          
+          metadata.from_file(target.join("metadata.rb").to_s)
+          metadata.name.empty? ? File.basename(target) : metadata.name
+        rescue IOError
+          File.basename(target)
+        end
+      end
   end
 end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.4.0.rc1"
+  VERSION = "0.4.0.rc2"
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -2,31 +2,17 @@ require 'spec_helper'
 
 module Berkshelf
   describe Berksfile do
-    describe "ClassMethods" do
-      subject { Berksfile }
-
-      let(:content) do
+    let(:content) do
 <<-EOF
 cookbook 'ntp', '<= 1.0.0'
 cookbook 'mysql'
 cookbook 'nginx', '< 0.101.2'
 cookbook 'ssh_known_hosts2', :git => 'https://github.com/erikh/chef-ssh_known_hosts2.git'
 EOF
-      end
-
-      describe "#read" do
-        it "reads the content of a Berksfile and adds the sources to the Shelf" do
-          cbfile = subject.read(content)
-
-          ['ntp', 'mysql', 'nginx', 'ssh_known_hosts2'].each do |name|
-            cbfile.should have_source(name)
-          end
-        end
-
-        it "returns an instance of Berksfile" do
-          subject.read(content).should be_a(Berksfile)
-        end
-      end
+    end
+    
+    describe "ClassMethods" do
+      subject { Berksfile }
 
       describe "#from_file" do
         let(:cookbook_file) { fixtures_path.join('lockfile_spec', 'with_lock', 'Berksfile') }
@@ -77,7 +63,7 @@ EOF
     let(:source_two) { double('source_two', name: "mysql") }
 
     subject do
-      cbf = Berksfile.new
+      cbf = Berksfile.new(tmp_path.join("Berksfile"))
       cbf.add_source(source_one)
       cbf.add_source(source_two)
       cbf
@@ -205,5 +191,19 @@ EOF
         linked_path_two.should be_cookbook
       end
     end
+
+    describe "#load" do
+      it "reads the content of a Berksfile and adds the sources to the Shelf" do
+        subject.load(content)
+
+        ['ntp', 'mysql', 'nginx', 'ssh_known_hosts2'].each do |name|
+          subject.should have_source(name)
+        end
+      end
+
+      it "returns an instance of Berksfile" do
+        subject.load(content).should be_a(Berksfile)
+      end
+    end
   end
 end

data/spec/unit/berkshelf/cookbook_generator_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+module Berkshelf
+  describe CookbookGenerator do
+    subject { CookbookGenerator }
+
+    let(:name) { "sparkle_motion" }
+    let(:target) { tmp_path.join(name) }
+
+    context "with default options" do
+      before do
+        generator = subject.new([name, target])
+        capture(:stdout) { generator.invoke_all }
+      end
+
+      specify do
+        target.should have_structure {
+          directory "attributes"
+          directory "definitions"
+          directory "files" do
+            directory "default"
+          end
+          directory "libraries"
+          directory "providers"
+          directory "recipes" do
+            file "default.rb" do
+              contains "# Cookbook Name:: sparkle_motion"
+              contains "# Recipe:: default"
+              contains "# Copyright (C) #{Time.now.year} YOUR_NAME"
+              contains "# All rights reserved - Do Not Redistribute"
+            end
+          end
+          directory "resources"
+          directory "templates" do
+            directory "default"
+          end
+          file "LICENSE" do
+            contains "Copyright (C) #{Time.now.year} YOUR_NAME"
+            contains "All rights reserved - Do Not Redistribute"
+          end
+          file "README.md" do
+            contains "# sparkle_motion cookbook"
+            contains "Author:: YOUR_NAME (<YOUR_EMAIL>)"
+          end
+          file "metadata.rb" do
+            contains "name             \"sparkle_motion\""
+            contains "maintainer       \"YOUR_NAME\""
+            contains "maintainer_email \"YOUR_EMAIL\""
+            contains "license          \"All rights reserved\""
+            contains "description      \"Installs/Configures sparkle_motion\""
+          end
+          file "Berksfile" do
+            contains "metadata"
+          end
+          file "Gemfile"
+          file "chefignore"
+        }
+      end
+    end
+
+    context "given a value for the maintainer_email option" do
+      before do
+        @email = "jamie@vialstudios.com"
+        generator = subject.new([name, target], maintainer_email: @email)
+        capture(:stdout) { generator.invoke_all }
+      end
+
+      it "generates a metadata.rb with a default value for maintainer_email" do
+        email = @email
+
+        target.should have_structure {
+          file "metadata.rb" do
+            contains "maintainer_email \"#{email}\""
+          end
+        }
+      end
+    end
+  end
+end