whisk 0.2.3 → 0.3.0

data/README.md

@@ -1,6 +1,8 @@
 Whisk
 =====
 
+[![Build Status](https://secure.travis-ci.org/kisoku/whisk.png)](http://travis-ci.org/kisoku/whisk)
+
 Whisk is a simple cookbook manager for Chef, inspired by librarian and
 berkshelf.
 
@@ -48,6 +50,17 @@ Whisk requires that the following code be added to your knife.rb
 
 # Commands #
 
+## whisk destroy ##
+
+Whisk destroys deletes the specified bowls or cookbooks from your filesystem.
+Use with care.
+
+## whisk diff ##
+
+Whisk diff simply runs 'git diff' in each of the ingredients specified. It
+currently has no support for running diff with anything other than the default
+arguments
+
 ##  whisk list ##
 
 The list subcommand will list the short name of all of the configured

data/lib/whisk/cli.rb

@@ -24,7 +24,6 @@ class Whisk
   class CLI < Thor
     def initialize(*)
       super
-      # JW TODO: Replace Chef::Knife::UI with our own UI class
       ::Whisk.ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
       @options = options.dup # unfreeze frozen options Hash from Thor
     rescue Error => e
@@ -34,77 +33,53 @@ class Whisk
 
     namespace "whisk"
 
-    method_option :whiskfile,
+    class_option :whiskfile,
       type: :string,
       default: File.join(Dir.pwd, Whisk::DEFAULT_FILENAME),
       desc: "Path to a Whiskfile to operate off of.",
       aliases: "-w",
       banner: "PATH"
+
+    desc "destroy", "destroy your bowls"
+    def destroy(filter=nil)
+      runner = Whisk::Runner.new(options[:whiskfile], filter)
+      runner.run('destroy')
+    end
+
     desc "diff", "run git diff in your bowls"
     def diff(filter=nil)
       runner = Whisk::Runner.new(options[:whiskfile], filter)
       runner.run('diff')
     end
 
-    method_option :whiskfile,
-      type: :string,
-      default: File.join(Dir.pwd, Whisk::DEFAULT_FILENAME),
-      desc: "Path to a Whiskfile to operate off of.",
-      aliases: "-w",
-      banner: "PATH"
     desc "list", "list the configured bowls and ingredients"
     def list(filter=nil)
       runner = Whisk::Runner.new(options[:whiskfile], filter)
       runner.run('list')
     end
 
-    method_option :whiskfile,
-      type: :string,
-      default: File.join(Dir.pwd, Whisk::DEFAULT_FILENAME),
-      desc: "Path to a Whiskfile to operate off of.",
-      aliases: "-w",
-      banner: "PATH"
     desc "prepare", "prepare a bowl by cloning any missing repositories"
     def prepare(filter=nil)
       runner = Whisk::Runner.new(options[:whiskfile], filter)
       runner.run('prepare')
     end
 
-    method_option :whiskfile,
-      type: :string,
-      default: File.join(Dir.pwd, Whisk::DEFAULT_FILENAME),
-      desc: "Path to a Whiskfile to operate off of.",
-      aliases: "-w",
-      banner: "PATH"
     desc "status", "run git status in your bowls"
     def status(filter=nil)
       runner = Whisk::Runner.new(options[:whiskfile], filter)
       runner.run('status')
     end
 
-    method_option :whiskfile,
-      type: :string,
-      default: File.join(Dir.pwd, Whisk::DEFAULT_FILENAME),
-      desc: "Path to a Whiskfile to operate off of.",
-      aliases: "-w",
-      banner: "PATH"
     desc "update", "run git remote update in your bowls"
     def update(filter=nil)
       runner = Whisk::Runner.new(options[:whiskfile], filter)
       runner.run('update')
     end
 
-    method_option :whiskfile,
-      type: :string,
-      default: File.join(Dir.pwd, Whisk::DEFAULT_FILENAME),
-      desc: "Path to a Whiskfile to operate off of.",
-      aliases: "-w",
-      banner: "PATH"
     desc "upload", "upload the specified bowls to a chef server"
     def upload(filter=nil)
       runner = Whisk::Runner.new(options[:whiskfile], filter)
       runner.run('upload')
     end
-
   end
 end

data/lib/whisk/provider.rb

@@ -25,5 +25,9 @@ class Whisk
     def initialize(resource)
       @resource = resource
     end
+
+    def action_nothing
+      nil
+    end
   end
 end

data/lib/whisk/provider/bowl.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef/json_compat'
 require 'whisk'
 require 'whisk/provider'
 require 'whisk/mixin/shellout'
@@ -26,12 +27,34 @@ class Whisk
 
       include Whisk::Mixin::ShellOut
 
+      def initialize(resource)
+        super
+        @environment = nil
+      end
+
+      def environment
+        if resource.environment
+          unless @environment.is_a? Chef::Environment
+            env_json = run_command!("knife environment show -F json #{resource.environment}").stdout
+            @environment = Chef::JSONCompat.from_json(env_json)
+          end
+        end
+        @environment
+      end
+
       def exist?
         ::Dir.exist? resource.path
       end
 
       def ingredients_run(action)
         resource.ingredients.each do |name, ingredient|
+          if ingredient.ref == :ref_from_environment
+            if environment and environment.cookbook_versions.has_key? ingredient.name
+              ingredient.ref environment.cookbook_versions[ingredient.name]
+            else
+              Whisk.ui.warn "Cookbook version for ingredient #{name} not found in environment #{resource.environment}"
+            end
+          end
           ingredient.run_action(action)
         end
       end
@@ -50,6 +73,16 @@ class Whisk
         end
       end
 
+      def action_destroy
+        if self.exist?
+          ingredients_run("destroy")
+          if Dir.entries(resource.path) == ["..", "."]
+            Whisk.ui.info("Destroying empty bowl #{resource.name}")
+            Dir.unlink(resource.path)
+          end
+        end
+      end
+
       def action_diff
         if self.exist?
           ::Dir.chdir resource.path
@@ -90,7 +123,8 @@ class Whisk
       def action_upload
         if self.exist?
           Whisk.ui.info "Uploading ingredients in bowl '#{resource.name}'"
-          shell_out!("knife cookbook upload --all", :env => knife_env)
+          cookbooks = resource.ingredients.to_a.map {|name, cb| name}
+          shell_out!("knife cookbook upload #{cookbooks.join(' ')}", :env => knife_env)
         end
       end
     end

data/lib/whisk/provider/ingredient.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'grit'
 require 'whisk/mixin/shellout'
 
 class Whisk
@@ -24,53 +25,158 @@ class Whisk
 
       include Whisk::Mixin::ShellOut
 
+      def add_remotes
+        resource.remotes.each_pair do |remote, url|
+          add_remote(remote, url)
+        end
+      end
+
+      def add_remote(remote, url)
+        ::Dir.chdir resource.path
+        if repo.config.keys.include?("remote.#{remote}.url")
+          if remote_changed? remote
+            Whisk.ui.info "Remote #{remote} points to a different url"
+            a = Whisk.ui.ask_question("Would you like to change it to point to #{url} ?",
+                  {:default => 'y'}
+            )
+            if a =~ /y/i
+              run_command!("git remote rm #{remote}")
+            else
+              Whisk.ui.info("Skipping out of date remote #{remote}")
+              return
+            end
+          else
+            Whisk.ui.info "Remote #{remote} already added"
+            return
+          end
+        end
+        Whisk.ui.info "Adding remote #{remote} to ingredient #{resource.name}"
+        run_command!("git remote add #{remote} #{url}")
+      end
+
+      def checkout
+        if resource.ref
+          if self.current_ref == resource.ref
+            Whisk.ui.info "Ingredient '#{resource.name}' already at ref '#{resource.ref}'"
+          else
+            Whisk.ui.info "Checking out ref '#{resource.ref}' for ingredient '#{resource.name}'"
+            cmd = run_command!("git checkout #{resource.ref}", :cwd => resource.path)
+            cmd.stdout.lines.each do |line|
+              Whisk.ui.info "\s\s#{line}"
+            end
+            cmd.stderr.lines.each do |line|
+              Whisk.ui.info "\s\s#{line}"
+            end
+          end
+        end
+      end
+
       def clone
-        if ::File.exists? File.join(Dir.pwd, resource.name, ".git", "config")
-          Whisk.ui.info "Ingredient '#{resource.name}' already prepared"
+        if git.exist?
+          if remote_changed?("origin", resource.source)
+            reset_origin
+          else
+            Whisk.ui.info "Ingredient '#{resource.name}' already prepared"
+          end
         else
           Whisk.ui.info "Cloning ingredient '#{resource.name}', " + "from url #{resource.source}"
-          shell_out!("git clone #{resource.source} #{resource.name}")
+          cmd = run_command!("git clone #{resource.source} #{resource.path}")
+          cmd.stdout.lines.each do |line|
+            Whisk.ui.info "\s\s#{line}"
+          end
+          cmd.stderr.lines.each do |line|
+            Whisk.ui.info "\s\s#{line}"
+          end
         end
       end
 
       def current_ref
-        cref = run_command!("git rev-parse --abbrev-ref HEAD", :cwd => resource.name).stdout.chomp
+        cref = run_command!("git rev-parse --abbrev-ref HEAD", :cwd => resource.path).stdout.chomp
         if cref == 'HEAD'
-          return run_command!("git describe --tags", :cwd => resource.name).stdout.chomp
+          return run_command!("git describe --tags", :cwd => resource.path).stdout.chomp
         else
           return cref
         end
       end
 
-      def checkout
-        if resource.ref
-          if self.current_ref == resource.ref
-            Whisk.ui.info "Ingredient '#{resource.name}' already at ref '#{resource.ref}'"
+      def destroy
+        if git.exist?
+          Whisk.ui.info "Destroying Ingredient #{resource.name}"
+          ::FileUtils.rm_rf resource.path
+        else
+          Whisk.ui.info "Ingredient #{resource.name} already destroyed"
+        end
+      end
+
+      def git
+        Grit::Git.new(resource.path)
+      end
+
+      def repo
+        Grit::Repo.new(resource.path)
+      end
+
+      def remote_changed?(remote, source)
+        if git.exist? and resource.source != repo.config["remote.#{remote}.url"]
+          Whisk.ui.info "Remote origin has changed for ingredient #{resource.name}"
+          true
+        else
+          false
+        end
+      end
+
+      def reset_origin
+        if remote_changed?("origin", new_source.source)
+          a = Whisk.ui.ask_question(
+            "Would you like to remove ingredient #{resource.name} before proceeding ?",
+            { :default => 'y' }
+          )
+          if a =~ /y/i
+            destroy
+            clone
           else
-            Whisk.ui.info "Checking out ref '#{resource.ref}' for ingredient '#{resource.name}'"
-            shell_out!("git checkout #{resource.ref}", :cwd => resource.name)
+            Whisk.ui.warn "Aborting whisk"
+            exit 1
           end
         end
       end
 
+      def action_destroy
+        destroy
+      end
+
       def action_diff
         Whisk.ui.info "Diff for ingredient '#{resource.name}'"
-        shell_out!("git diff", :cwd => resource.name)
+        shell_out!("git diff", :cwd => resource.path)
       end
 
       def action_prepare
         self.clone
         self.checkout
+        self.add_remotes
       end
 
       def action_status
         Whisk.ui.info "Status for ingredient '#{resource.name}'"
-        shell_out!("git status", :cwd => resource.name)
+        cmd = run_command!("git status", :cwd => resource.path)
+        cmd.stdout.lines.each do |line|
+          Whisk.ui.info "\s\s#{line}"
+        end
+        cmd.stderr.lines.each do |line|
+          Whisk.ui.info "\s\s#{line}"
+        end
+        Whisk.ui.info "\n"
       end
 
       def action_update
         Whisk.ui.info "Updating ingredient '#{resource.name}'"
-        shell_out!("git remote update", :cwd => resource.name)
+        cmd = run_command!("git remote update", :cwd => resource.path)
+        cmd.stdout.lines.each do |line|
+          Whisk.ui.info "\s\s#{line}"
+        end
+        cmd.stderr.lines.each do |line|
+          Whisk.ui.info "\s\s#{line}"
+        end
       end
     end
   end

data/lib/whisk/resource.rb

@@ -37,15 +37,9 @@ class Whisk
     end
 
     def provider(arg=nil)
-      klass = if arg.kind_of?(String) || arg.kind_of?(Symbol)
-                raise ArgumentError, "must provide provider by klass"
-                # lookup_provider_constant(arg)
-              else
-                arg
-              end
       set_or_return(
         :provider,
-        klass,
+        arg,
         :kind_of => [ Class ]
       )
     end

data/lib/whisk/resource/bowl.rb

@@ -38,12 +38,23 @@ class Whisk
           raise ArgumentError, "Ingredient '#{iname}' has already been added to bowl '#{name}'"
         else
           ingredients[iname] = Whisk::Resource::Ingredient.new(iname, self, &block)
+          if refs_from_environment
+            ingredients[iname].ref :ref_from_environment
+          end
         end
       end
 
+      def environment(arg=nil)
+        set_or_return(:environment, arg, :kind_of => String)
+      end
+
       def path(arg=nil)
         set_or_return(:path, arg, :default => File.join(Dir.getwd, name))
       end
+
+      def refs_from_environment(arg=nil)
+        set_or_return(:refs_from_environment, arg, :kind_of => [TrueClass, FalseClass], :default => false)
+      end
     end
   end
 end

data/lib/whisk/resource/ingredient.rb

@@ -25,23 +25,36 @@ class Whisk
 
       include Chef::Mixin::ParamsValidate
 
-      attr_accessor :bowl
+      attr_accessor :bowl, :remotes
 
       def initialize(name, bowl, &block)
         @bowl = bowl
         @provider = Whisk::Provider::Ingredient
         @ref = nil
+        @remotes = {}
         @source = nil
 
         super(name, &block)
       end
 
+      def path
+        File.join(self.bowl.path, self.name)
+      end
+
       def source(arg=nil)
         set_or_return(:source, arg, :required => true)
       end
 
       def ref(arg=nil)
-        set_or_return(:ref, arg, :kind_of => String)
+        set_or_return(:ref, arg, :kind_of => [String, Symbol])
+      end
+
+      def remote(rname, url)
+        if remotes.has_key?(name)
+          raise ArgumentError, "remote #{rname} already defined for ingredient #{name}"
+        else
+          remotes[rname] = url
+        end
       end
     end
   end

data/lib/whisk/version.rb

@@ -17,5 +17,5 @@
 #
 
 class Whisk
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/whisk/whiskfile.rb

@@ -26,31 +26,33 @@ require 'whisk'
 
 class Whisk
   class WhiskFile
-    @@bowls = {}
 
-    class << self
-      def add_bowl(bowl)
-        if @@bowls.has_key? name
-          raise ArgumentError, "bowl #{name} already exists"
-        else
-          @@bowls[bowl.name] = bowl
-        end
-      end
+    attr_accessor :bowls
 
-      def bowl(name, &block)
-        b = Whisk::Resource::Bowl.new(name)
-        b.instance_eval(&block)
-        add_bowl(b)
-      end
+    def initialize
+      @bowls = {}
+    end
 
-      def bowls
-        @@bowls
+    def add_bowl(bowl)
+      if bowls.has_key? bowl.name
+        raise ArgumentError, "bowl #{bowl.name} already exists"
+      else
+        bowls[bowl.name] = bowl
       end
+    end
 
+    def bowl(name, &block)
+      b = Whisk::Resource::Bowl.new(name)
+      b.instance_eval(&block) if block_given?
+      add_bowl(b)
+    end
+
+    class << self
       def from_file(filename)
         if ::File.exists?(filename) && ::File.readable?(filename)
-          instance_eval(::IO.read(filename), filename, 1)
-          self
+          whiskfile = Whisk::WhiskFile.new
+          whiskfile.instance_eval(::IO.read(filename), filename, 1)
+          whiskfile
         else
           raise IOError, "Cannot open or read #{filename}!"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whisk
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,22 @@ dependencies:
     - - ! '>='
       - !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'
 description: A simple Chef cookbook dependency manager
 email: msf@kisoku.net
 executables: