between_meals 0.0.5 → 0.0.6

data/README.md

@@ -9,8 +9,8 @@ Between Meals is the library for calculating what Chef objects where modified
 between two revisions in a version control system. It is also the library
 that that backs Taste Tester and Grocery Delivery.
 
-It currently supports SVN and GIT, but plugins can easily be written for
-other systems.
+It currently supports SVN, GIT and HG, but plugins can easily be written for
+other source control systems.
 
 It also includes some wrappers around knife execution and a few other utility
 functions.

data/lib/between_meals/changes/change.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # 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.

data/lib/between_meals/changes/cookbook.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # 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.
@@ -54,10 +54,10 @@ module BetweenMeals
         # otherwise it was modified
         #   and will be re-uploaded
         if files.
-          select { |x| x[:status] == :deleted }.
-          map { |x| x[:path].match(%{.*metadata\.rb$}) }.
-          compact.
-          any?
+           select { |x| x[:status] == :deleted }.
+           map { |x| x[:path].match(%{.*metadata\.rb$}) }.
+           compact.
+           any?
           @status = :deleted
         else
           @status = :modified
@@ -78,7 +78,7 @@ module BetweenMeals
           g = self.explode_path(x[:path], cookbook_dirs)
           g[:cookbook_dir] + '/' + g[:name] if g
         end.
-        map do |_, change|
+          map do |_, change|
           # Confirm we're dealing with a cookbook
           # Changes to OWNERS or other stuff that might end up
           # in [core, other, secure] dirs are ignored

data/lib/between_meals/changes/databag.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # 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.

data/lib/between_meals/changes/role.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # 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.
@@ -20,7 +20,7 @@ module BetweenMeals
     # Changeset aware role
     class Role < Change
       def self.name_from_path(path, role_dir)
-        re = "^#{role_dir}\/(.+)\.rb"
+        re = %r{^#{role_dir}/(.+)\.rb}
         debug("[role] Matching #{path} against #{re}")
         m = path.match(re)
         if m

data/lib/between_meals/changeset.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # 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.

data/lib/between_meals/cmd.rb

@@ -0,0 +1,44 @@
+# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
+
+# Copyright 2013-present Facebook
+#
+# 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.
+
+require 'logger'
+
+module BetweenMeals
+  class Cmd
+    attr_accessor :bin
+
+    def initialize(params)
+      @bin = params[:bin] || fail
+      @cwd = params[:cwd] || Dir.pwd
+      @logger = params[:logger] || Logger.new(STDOUT)
+    end
+
+    def cmd(params, cwd = nil)
+      unless cwd
+        cwd = File.expand_path(@cwd)
+      end
+      cmd = "#{@bin} #{params}"
+      @logger.info("Running \"#{cmd}\"")
+      c = Mixlib::ShellOut.new(
+        cmd,
+        :cwd => cwd
+      )
+      c.run_command
+      c.error!
+      c
+    end
+  end
+end

data/lib/between_meals/knife.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # 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.
@@ -31,14 +31,16 @@ module BetweenMeals
       @user = opts[:user] || ENV['USER']
       @home = opts[:home] || ENV['HOME']
       # make sure people can pass in false :)
-      @ssl = opts[:ssl].nil? ? true : opts[:ssl] 
+      @ssl = opts[:ssl].nil? ? true : opts[:ssl]
       @host = opts[:host] || 'localhost'
       @port = opts[:port] || 4000
       @config = opts[:config] ||
-        "#{@home}/.chef/knife-#{@user}-taste-tester.rb"
+                "#{@home}/.chef/knife-#{@user}-taste-tester.rb"
       @knife = opts[:bin] || 'knife'
+      @berks = opts[:berks_bin] || 'berks'
+      @berks_config = opts[:berks_config]
       @pem = opts[:pem] ||
-        "#{@home}/.chef/#{@user}-taste-tester.pem"
+             "#{@home}/.chef/#{@user}-taste-tester.pem"
       @role_dir = opts[:role_dir]
       @cookbook_dirs = opts[:cookbook_dirs]
       @databag_dir = opts[:databag_dir]
@@ -48,8 +50,10 @@ module BetweenMeals
     end
 
     def role_upload_all
-      roles = File.join(@role_dir, '*.rb')
-      exec!("#{@knife} role from file #{roles} -c #{@config}", @logger)
+      if File.exists?(@role_dir)
+        roles = File.join(@role_dir, '*.rb')
+        exec!("#{@knife} role from file #{roles} -c #{@config}", @logger)
+      end
     end
 
     def role_upload(roles)
@@ -73,13 +77,45 @@ module BetweenMeals
       exec!("#{@knife} cookbook upload -a -c #{@config}", @logger)
     end
 
+    def berks_cookbook_upload_all
+      if @berks_config
+        berks_config = '--config=' + @berks_config
+      end
+      @cookbook_dirs.each do |path|
+        cookbooks = Dir["#{path}/*"].select { |o| File.directory?(o) }
+        cookbooks.each do |cb|
+          @logger.warn("Running berkshelf on cookbook: #{cb}")
+          exec!("cd #{cb} && #{@berks} install #{berks_config} && " +
+            "#{@berks} upload #{berks_config}", @logger)
+        end
+      end
+    end
+
     def cookbook_upload(cookbooks)
       if cookbooks.any?
-        cookbooks = cookbooks.map { |x| x.name }.join(' ')
+        cookbooks = cookbooks.map(&:name).join(' ')
         exec!("#{@knife} cookbook upload #{cookbooks} -c #{@config}", @logger)
       end
     end
 
+    def berks_cookbook_upload(cookbooks)
+      # cookbooks: array
+      # cookbook_paths: array
+      if @berks_config
+        berks_config = '--config=' + @berks_config
+      end
+      if cookbooks.any?
+        @cookbook_dirs.each do |path|
+          cookbooks.each do |cb|
+            next unless File.exists?("#{path}/#{cb}")
+            @logger.warn("Running berkshelf on cookbook: #{cb}")
+            exec!("cd #{path}/#{cb} && #{@berks} install #{berks_config} && " +
+              "#{@berks} upload #{berks_config}", @logger)
+          end
+        end
+      end
+    end
+
     def cookbook_delete(cookbooks)
       if cookbooks.any?
         cookbooks.each do |cookbook|
@@ -101,19 +137,22 @@ module BetweenMeals
 
     def databag_upload(databags)
       if databags.any?
-        databags.group_by { |x| x.name }.each do |dbname, dbs|
+        databags.group_by(&:name).each do |dbname, dbs|
           create_databag_if_missing(dbname)
           dbitems = dbs.map do |x|
             File.join(@databag_dir, dbname, "#{x.item}.json")
           end.join(' ')
-          exec!("#{@knife} data bag from file #{dbname} #{dbitems}", @logger)
+          exec!(
+            "#{@knife} data bag from file #{dbname} #{dbitems} -c #{@config}",
+            @logger
+          )
         end
       end
     end
 
     def databag_delete(databags)
       if databags.any?
-        databags.group_by { |x| x.name }.each do |dbname, dbs|
+        databags.group_by(&:name).each do |dbname, dbs|
           dbs.each do |db|
             exec!("#{@knife} data bag delete #{dbname} #{db.item}" +
                     " --yes -c #{@config}", @logger)
@@ -146,7 +185,7 @@ BLOCK
       end
       if !File.exists?(@config) ||
          ::Digest::MD5.hexdigest(cfg) !=
-          ::Digest::MD5.hexdigest(File.read(@config))
+         ::Digest::MD5.hexdigest(File.read(@config))
         @logger.info("Generating #{@config}")
         File.write(@config, cfg)
       end

data/lib/between_meals/repo.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # 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.
@@ -19,8 +19,7 @@ require 'mixlib/shellout'
 module BetweenMeals
   # Local checkout wrapper
   class Repo
-    attr_reader :repo_path
-    attr_writer :bin
+    attr_reader :repo_path, :bin
 
     def initialize(repo_path, logger)
       @repo_path = repo_path
@@ -35,93 +34,138 @@ module BetweenMeals
 
     def self.get(type, repo_path, logger)
       case type
+      when 'auto'
+        unless File.directory?(repo_path)
+          logger.warn("#{repo_path} does not point to a repo")
+          exit(1)
+        end
+        logger.info('Trying to detect repo type')
+        require 'between_meals/repo/git'
+        require 'between_meals/repo/hg'
+        require 'between_meals/repo/svn'
+        [
+          BetweenMeals::Repo::Git,
+          BetweenMeals::Repo::Hg,
+          BetweenMeals::Repo::Svn,
+        ].each do |klass|
+          begin
+            r = klass.new(repo_path, logger)
+            if r.exists?
+              logger.info("Repo found to be #{klass.to_s.split('::').last}")
+              return r
+            end
+          rescue
+            logger.debug("Skipping #{klass}")
+          end
+        end
+        logger.warn("Failed detecting repo type at #{repo_path}")
+        exit(1)
       when 'svn'
         require 'between_meals/repo/svn'
         BetweenMeals::Repo::Svn.new(repo_path, logger)
       when 'git'
         require 'between_meals/repo/git'
         BetweenMeals::Repo::Git.new(repo_path, logger)
+      when 'hg'
+        require 'between_meals/repo/hg'
+        BetweenMeals::Repo::Hg.new(repo_path, logger)
       else
         fail "Do not know repo type #{type}"
       end
     end
 
+    def bin=(bin)
+      @bin = bin
+      @cmd.bin = bin
+    end
+
     def exists?
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def status
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
+    # This method *must* succeed in the case of no repo directory so that
+    # users can call `checkout`. Users may call `exists?` to find out if
+    # we have an underlying repo yet.
     def setup
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def head_rev
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def head_msg
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def head_msg=
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def head_parents
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def latest_revision
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def create(_url)
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     # Return files changed between two revisions
     def changes(_start_ref, _end_ref)
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def update
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     # Return all files
     def files
-      fail 'Not implemented'
-    end
-
-    def latest_revision
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def head
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def checkout
-      fail 'Not implemented'
-    end
-
-    def update
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def last_author
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def last_msg
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
     end
 
     def last_msg=
-      fail 'Not implemented'
+      fail "#{__method__} not implemented"
+    end
+
+    def name
+      fail "#{__method__} not implemented"
+    end
+
+    def email
+      fail "#{__method__} not implemented"
+    end
+
+    def upstream?(_rev)
+      fail "#{__method__} not implemented"
+    end
+
+    def valid_ref?(_rev)
+      fail "#{__method__} not implemented"
     end
   end
 end