berkshelf 0.2.0 → 0.3.0

data/LICENSE

@@ -1,22 +1,17 @@
-Copyright (c) 2012 Riot Games
+Author:: Jamie Winsor (<jamie@vialstudios.com>)
+Author:: Josiah Kiehl (<josiah@skirmisher.net>)
+Author:: Michael Ivey (<ivey@gweezlebur.com>)
 
-MIT License
+Copyright 2012 Riot Games
 
-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:
+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
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+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/README.md

@@ -16,7 +16,7 @@ See [berkshelf.com](http://berkshelf.com) for up-to-date usage instructions.
 
 ### Install prerequisites
 
-Install the latest version of {Bundler}[http://gembundler.com]
+Install the latest version of [Bundler](http://gembundler.com)
 
     $ gem install bundler
 

data/bin/berks

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+$:.push File.expand_path("../../lib", __FILE__)
+require 'berkshelf'
+
+Berkshelf::Cli.start

data/features/step_definitions/cli_steps.rb

@@ -27,31 +27,31 @@ Then /^the file "(.*?)" should contain in the current directory:$/ do |filename,
 end
 
 When /^I run the init command with the cookbook "(.*?)" as the target$/ do |cookbook_name|
-  run_simple(unescape("knife berks init #{cookbook_name}"), false)
+  run_simple(unescape("berks init #{cookbook_name}"), true)
 end
 
 When /^I run the init command with the directory "(.*?)" as the target$/ do |directory_name|
-  run_simple(unescape("knife berks init #{directory_name}"), false)
+  run_simple(unescape("berks init #{directory_name}"), true)
 end
 
 When /^I run the init command with no value for the target$/ do
-  run_simple(unescape("knife berks init"), false)
+  run_simple(unescape("berks init"), true)
 end
 
 When /^I run the install command$/ do
-  run_simple(unescape("knife berks install"), true)
+  run_simple(unescape("berks install"), true)
 end
 
 When /^I run the install command with flags:$/ do |flags|
-  run_simple(unescape("knife berks install #{flags.raw.join(" ")}"), true)
+  run_simple(unescape("berks install #{flags.raw.join(" ")}"), true)
 end
 
 When /^I run the update command$/ do
-  run_simple(unescape("knife berks update"), false)
+  run_simple(unescape("berks update"), true)
 end
 
 When /^I run the upload command$/ do
-  run_simple(unescape("knife berks upload"), false)
+  run_simple(unescape("berks upload"), true)
 end
 
 Then /^the CLI should exit with the status code for error "(.*?)"$/ do |error_constant|

data/lib/berkshelf.rb

@@ -17,6 +17,7 @@ module Berkshelf
   DEFAULT_STORE_PATH = File.expand_path("~/.berkshelf").freeze
   DEFAULT_FILENAME = 'Berksfile'.freeze
 
+  autoload :Cli, 'berkshelf/cli'
   autoload :DSL, 'berkshelf/dsl'
   autoload :Git, 'berkshelf/git'
   autoload :Berksfile, 'berkshelf/berksfile'
@@ -37,7 +38,7 @@ module Berkshelf
     attr_accessor :downloader
 
     def root
-      File.join(File.dirname(__FILE__), '..')
+      @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
     end
 
     def ui

data/lib/berkshelf/cli.rb

@@ -0,0 +1,152 @@
+require 'thor'
+require 'berkshelf'
+
+module Berkshelf
+  # @author Jamie Winsor <jamie@vialstudios.com>
+  class Cli < Thor
+    def initialize(*)
+      super
+      # JW TODO: Replace Chef::Knife::UI with our own UI class
+      ::Berkshelf.ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
+      load_config
+      @options = options.dup # unfreeze frozen options Hash from Thor
+    rescue BerkshelfError => e
+      Berkshelf.ui.fatal e
+      exit e.status_code
+    end
+
+    namespace "berkshelf"
+
+    map 'in'        => :install
+    map 'up'        => :upload
+    map 'ud'        => :update
+    map 'ver'       => :version
+
+    class_option :config,
+      type: :string,
+      default: File.expand_path("~/.chef/knife.rb"),
+      desc: "Path to Knife or Chef configuration to use.",
+      aliases: "-c",
+      banner: "PATH"
+
+    method_option :shims,
+      type: :string,
+      default: nil,
+      desc: "Create a directory of shims pointing to Cookbook Versions.",
+      banner: "PATH"
+    method_option :without,
+      type: :array,
+      default: Array.new,
+      desc: "Exclude cookbooks that are in these groups.",
+      aliases: "-w"
+    method_option :berksfile,
+      type: :string,
+      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      desc: "Path to a Berksfile to operate off of.",
+      aliases: "-b",
+      banner: "PATH"
+    desc "install", "Install the Cookbooks specified by a Berksfile or a Berskfile.lock."
+    def install
+      if options[:shims] == "shims" # This means 'no value given'.
+        options[:shims] = default_shims_path
+      end
+
+      berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
+      berksfile.install(options)
+    rescue BerkshelfError => e
+      Berkshelf.ui.fatal e
+      exit e.status_code
+    end
+
+    method_option :berksfile,
+      type: :string,
+      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      desc: "Path to a Berksfile to operate off of.",
+      aliases: "-b",
+      banner: "PATH"
+    method_option :without,
+      type: :array,
+      default: Array.new,
+      desc: "Exclude cookbooks that are in these groups.",
+      aliases: "-w"
+    desc "update", "Update all Cookbooks and their dependencies specified by a Berksfile to their latest versions."
+    def update
+      Lockfile.remove!
+      invoke :install
+    rescue BerkshelfError => e
+      Berkshelf.ui.fatal e
+      exit e.status_code
+    end
+
+    method_option :berksfile,
+      type: :string,
+      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      desc: "Path to a Berksfile to operate off of.",
+      aliases: "-b",
+      banner: "PATH"
+    method_option :without,
+      type: :array,
+      default: Array.new,
+      desc: "Exclude cookbooks that are in these groups.",
+      aliases: "-w"
+    method_option :freeze,
+      type: :boolean,
+      default: false,
+      desc: "Freeze the uploaded cookbooks so that they cannot be overwritten"
+    option :force,
+      type: :boolean,
+      default: false,
+      desc: "Upload all cookbooks even if a frozen one exists on the target Chef Server"
+    desc "upload", "Upload the Cookbooks specified by a Berksfile or a Berksfile.lock to a Chef Server."
+    def upload
+      berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
+      berksfile.upload(Chef::Config[:chef_server_url], options)
+    rescue BerkshelfError => e
+      Berkshelf.ui.fatal e
+      exit e.status_code
+    end
+
+    desc "init [PATH]", "Prepare a local path to have it's Cookbook dependencies managed by Berkshelf."
+    def init(path = Dir.pwd)
+      if File.chef_cookbook?(path)
+        options[:chefignore] = true
+        options[:metadata_entry] = true
+      end
+
+      generator = ::Berkshelf::InitGenerator.new([path], options)
+      generator.invoke_all
+
+      ::Berkshelf.ui.info "Successfully initialized"
+    rescue BerkshelfError => e
+      Berkshelf.ui.fatal e
+      exit e.status_code
+    end
+
+    desc "version", "Display version and copyright information"
+    def version
+      Berkshelf.ui.info version_header
+      Berkshelf.ui.info "\n"
+      Berkshelf.ui.info license
+    end
+
+    private
+
+      def version_header
+        "Berkshelf (#{Berkshelf::VERSION})"
+      end
+
+      def license
+        File.read(Berkshelf.root.join('LICENSE'))
+      end
+
+      def load_config
+        Chef::Config.from_file(File.expand_path(options[:config]))
+      rescue Errno::ENOENT
+        raise KnifeConfigNotFound, "Unable to find a Knife config at #{options[:config]}. Specify a different path with --config."
+      end
+
+      def default_shims_path
+        File.join(Dir.pwd, "cookbooks")
+      end
+  end
+end

data/lib/berkshelf/errors.rb

@@ -17,4 +17,5 @@ module Berkshelf
   class NoSolution < BerkshelfError; status_code(106); end
   class CookbookSyntaxError < BerkshelfError; status_code(107); end
   class UploadFailure < BerkshelfError; status_code(108); end
+  class KnifeConfigNotFound < BerkshelfError; status_code(109); end
 end

data/lib/berkshelf/init_generator.rb

@@ -3,9 +3,15 @@ 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"))
+      end
+    end
+    
     include Thor::Actions
 
-    class_option :path,
+    argument :path,
       :type => :string,
       :required => true
 
@@ -17,22 +23,14 @@ module Berkshelf
       :type => :boolean,
       :default => false
 
-    def self.source_root
-      File.expand_path(File.join(File.dirname(__FILE__), "generator_files"))
-    end
-
     def generate
+      target_path = File.expand_path(path)
+
       template "Berksfile.erb", File.join(target_path, "Berksfile")
 
       if options[:chefignore]
         copy_file "chefignore", File.join(target_path, ".chefignore")
       end
     end
-
-    private
-
-      def target_path
-        @target_path ||= File.expand_path(options[:path])
-      end
   end
 end

data/lib/berkshelf/thor.rb

@@ -1,43 +1 @@
-require 'berkshelf'
-
-module Berkshelf
-  class ThorTasks < Thor
-    namespace "berkshelf"
-
-    method_option :config,
-      type: :string,
-      aliases: "-c",
-      desc: "Knife configuration file to use.",
-      default: File.expand_path("~/.chef/knife.rb")
-    method_option :without,
-      type: :array, 
-      aliases: "-w", 
-      desc: "Exclude cookbooks that are in these groups",
-      default: Array.new
-    method_option :force,
-      type: :boolean,
-      desc: "Fail the build if any of the specified tags are matched.",
-      default: false
-    method_option :freeze,
-      type: :boolean,
-      desc: "Freeze the uploaded cookbooks so that they cannot be overwritten.",
-      default: false
-    desc "upload", "Upload the sources defined in your Berksfile and their dependencies to a Chef Server."
-    def upload
-      begin
-        Chef::Config.from_file(File.expand_path(options[:config]))
-      rescue Errno::ENOENT
-        say "Unable to find a Knife config at #{options[:config]}. Specify a different path with --config.", :red
-        exit(10)
-      end
-
-      ::Berkshelf.ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
-      cookbook_file = ::Berkshelf::Berksfile.from_file(File.join(Dir.pwd, "Berksfile"))
-      cookbook_file.upload(Chef::Config[:chef_server_url],
-        without: options[:without],
-        freeze: options[:freeze],
-        force: options[:force]
-      )
-    end
-  end
-end
+require 'berkshelf/cli'

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dep_selector
@@ -340,7 +340,8 @@ email:
 - jamie@vialstudios.com
 - ivey@gweezlebur.com
 - erik@hollensbe.org
-executables: []
+executables:
+- berks
 extensions: []
 extra_rdoc_files: []
 files:
@@ -352,6 +353,7 @@ files:
 - README.md
 - Thorfile
 - berkshelf.gemspec
+- bin/berks
 - features/config.sample.yml
 - features/init_command.feature
 - features/install.feature
@@ -367,6 +369,7 @@ files:
 - lib/berkshelf.rb
 - lib/berkshelf/berksfile.rb
 - lib/berkshelf/cached_cookbook.rb
+- lib/berkshelf/cli.rb
 - lib/berkshelf/cookbook_source.rb
 - lib/berkshelf/cookbook_source/git_location.rb
 - lib/berkshelf/cookbook_source/path_location.rb
@@ -391,10 +394,6 @@ files:
 - lib/berkshelf/tx_result_set.rb
 - lib/berkshelf/uploader.rb
 - lib/berkshelf/version.rb
-- lib/chef/knife/berks_init.rb
-- lib/chef/knife/berks_install.rb
-- lib/chef/knife/berks_update.rb
-- lib/chef/knife/berks_upload.rb
 - spec/fixtures/Berksfile
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
@@ -459,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3927630543327707547
+      hash: 2507702980010171500
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/chef/knife/berks_init.rb

@@ -1,29 +0,0 @@
-require 'chef/knife'
-
-module Berkshelf
-  class BerksInit < Chef::Knife
-    deps do
-      require 'berkshelf'
-    end
-    
-    banner "knife berks init [PATH]"
-
-    def run
-      ::Berkshelf.ui = ui
-      config[:path] = File.expand_path(@name_args.first || Dir.pwd)
-
-      if File.chef_cookbook?(config[:path])
-        config[:chefignore] = true
-        config[:metadata_entry] = true
-      end
-
-      generator = ::Berkshelf::InitGenerator.new([], config)
-      generator.invoke_all
-
-      ::Berkshelf.ui.info "Successfully initialized"
-    rescue BerkshelfError => e
-      Berkshelf.ui.fatal e
-      exit e.status_code
-    end
-  end
-end

data/lib/chef/knife/berks_install.rb

@@ -1,42 +0,0 @@
-require 'chef/knife'
-
-module Berkshelf
-  class BerksInstall < Chef::Knife
-    deps do
-      require 'berkshelf'
-    end
-    
-    banner "knife berks install (options)"
-
-    option :shims,
-      short: "-s",
-      long: "--shims",
-      description: "Create a directory of shims pointing to Cookbook Versions.",
-      boolean: true
-    option :without,
-      short: "-W WITHOUT",
-      long: "--without WITHOUT",
-      description: "Exclude cookbooks that are in these groups",
-      proc: lambda { |w| w.split(",") },
-      default: Array.new
-    def run
-      ::Berkshelf.ui = ui
-      # JW TODO: replace knife with Thor bin. Opt parsing here isn't my favorite.
-      if config[:shims]
-        config[:shims] = shims_path
-      end
-
-      cookbook_file = ::Berkshelf::Berksfile.from_file(File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME))
-      cookbook_file.install(config)
-    rescue BerkshelfError => e
-      Berkshelf.ui.fatal e
-      exit e.status_code
-    end
-
-    private
-
-      def shims_path
-        File.join(Dir.pwd, "cookbooks")
-      end
-  end
-end

data/lib/chef/knife/berks_update.rb

@@ -1,24 +0,0 @@
-require 'chef/knife'
-require 'chef/knife/berks_install'
-
-module Berkshelf
-  class BerksUpdate < BerksInstall
-    deps do
-      require 'berkshelf'
-    end
-
-    banner "knife berks update"
-
-    alias :install_run :run
-
-    def run
-      ::Berkshelf.ui = ui
-
-      Lockfile.remove!
-      install_run
-    rescue BerkshelfError => e
-      Berkshelf.ui.fatal e
-      exit e.status_code
-    end
-  end
-end

data/lib/chef/knife/berks_upload.rb

@@ -1,39 +0,0 @@
-require 'chef/knife'
-
-module Berkshelf
-  class BerksUpload < Chef::Knife
-    deps do
-      require 'berkshelf'
-    end
-
-    banner "knife berks upload (options)"
-
-    option :without,
-      :short => "-W WITHOUT",
-      :long => "--without WITHOUT",
-      :description => "Exclude cookbooks that are in these groups",
-      :proc => lambda { |w| w.split(",") },
-      :default => Array.new
-
-    option :freeze,
-      :long => "--freeze",
-      :description => "Freeze the uploaded cookbooks so that they cannot be overwritten",
-      :boolean => true,
-      :default => false
-
-    option :force,
-      :long => "--force",
-      :description => "Upload all cookbooks even if a frozen one exists on the target Chef Server",
-      :boolean => true,
-      :default => false
-
-    def run
-      ::Berkshelf.ui = ui
-      cookbook_file = ::Berkshelf::Berksfile.from_file(File.join(Dir.pwd, "Berksfile"))
-      cookbook_file.upload(Chef::Config[:chef_server_url], config)
-    rescue BerkshelfError => e
-      Berkshelf.ui.fatal e
-      exit e.status_code
-    end
-  end
-end