grocery_delivery 0.0.5 → 0.0.6

data/README.md

@@ -1,5 +1,7 @@
 # Grocery Delivery
 
+[![Build Status](https://travis-ci.org/facebook/grocery-delivery.svg)](http://travis-ci.org/facebook/grocery-delivery)
+
 ## Intro
 Ohai!
 
@@ -70,11 +72,17 @@ In addition the following are also available:
   relative to `reponame`. Default: `gd_revision`
 * knife_config - Knife config to use for uploads. Default:
   `/root/.chef/knife.rb`
+  Note: `knife.rb` will need to set `cookbook_path` pointing to the cookbook
+  path in the work directory,
+  e.g. `/var/chef/grocery_delivery_work/ops/chef/cookbooks`
 * knife_bin - Path to knife. Default: `/opt/chef/bin/knife`
 * vcs_type - Git or SVN? Default: `svn`
 * vcs_path - Path to git or svn binary. If not given, just uses 'git' or 'svn'.
   Default: `nil`
 * plugin_path - Path to plugin file. Default: `/etc/gd-plugin.rb`
+* berks - Boolean to determine if we should use berkshelf to resolve 
+  dependencies and upload cookbooks. Default: `false`
+* berks_bin - Path to berkshelf. Default: `/opt/chefdk/bin/berks`
 
 ## Plugin
 

data/bin/grocery-delivery

@@ -1,14 +1,14 @@
-#!/opt/chef/embedded/bin/ruby
+#!/usr/bin/env ruby
 # 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.
@@ -66,8 +66,16 @@ def read_checkpoint
 end
 
 def full_upload(knife)
-  GroceryDelivery::Log.warn('Uploading all cookbooks')
-  knife.cookbook_upload_all
+  if GroceryDelivery::Config.berks
+    GroceryDelivery::Log.warn('Uploading all cookbooks with berkshelf')
+    GroceryDelivery::Log.debug(
+      "Using cookbook paths: #{GroceryDelivery::Config.cookbook_paths}"
+    )
+    knife.berks_cookbook_upload_all
+  else
+    GroceryDelivery::Log.warn('Uploading all cookbooks')
+    knife.cookbook_upload_all
+  end
   GroceryDelivery::Log.warn('Uploading all roles')
   knife.role_upload_all
   GroceryDelivery::Log.warn('Uploading all databags')
@@ -115,12 +123,17 @@ def partial_upload(knife, repo, checkpoint, local_head)
     'Deleted databags' => deleted_databags,
   }.each do |msg, list|
     if list
-      GroceryDelivery::Log.warn("#{msg}: #{list.map {|x| x.to_s}}")
+      GroceryDelivery::Log.warn("#{msg}: #{list.map(&:to_s)}")
     end
   end
 
   knife.cookbook_delete(deleted_cookbooks) if deleted_cookbooks
-  knife.cookbook_upload(added_cookbooks) if added_cookbooks
+  if GroceryDelivery::Config.berks
+    GroceryDelivery::Log.warn('Using Berkshelf to upload cookbooks')
+    knife.berks_cookbook_upload(added_cookbooks) if added_cookbooks
+  else
+    knife.cookbook_upload(added_cookbooks) if added_cookbooks
+  end
   knife.role_delete(deleted_roles) if deleted_roles
   knife.role_upload(added_roles) if added_roles
   knife.databag_delete(deleted_databags) if deleted_databags
@@ -137,6 +150,8 @@ def upload_changed(repo, checkpoint)
       :logger => GroceryDelivery::Log,
       :config => GroceryDelivery::Config.knife_config,
       :bin => GroceryDelivery::Config.knife_bin,
+      :berks_bin => GroceryDelivery::Config.berks_bin,
+      :berks_config => GroceryDelivery::Config.berks_config,
       :role_dir => File.join(base_dir, GroceryDelivery::Config.role_path),
       :cookbook_dirs => GroceryDelivery::Config.cookbook_paths.map do |x|
         File.join(base_dir, x)
@@ -181,6 +196,9 @@ def setup_config
     opts.on('-l', '--lockfile FILE', 'lockfile') do |s|
       options[:lockfile] = s
     end
+    opts.on('--stdout', 'Log to stdout as well.') do |_s|
+      options[:stdout] = true
+    end
     opts.on('-p', '--pidfile FILE', 'pidfile') do |s|
       options[:pidfile] = s
     end
@@ -190,6 +208,7 @@ def setup_config
   end
   GroceryDelivery::Config.merge!(options)
   GroceryDelivery::Log.verbosity = GroceryDelivery::Config.verbosity
+  GroceryDelivery::Log.stdout = GroceryDelivery::Config.stdout
   if GroceryDelivery::Config.dry_run
     GroceryDelivery::Log.warn('Dryrun mode activated, no changes will be made.')
   end

data/lib/grocery_delivery/config.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.
@@ -23,7 +23,7 @@ module GroceryDelivery
   # it's compatible with v2, so it should work in 11 too.
   class Config
     extend Mixlib::Config
-
+    stdout false
     dry_run false
     verbosity Logger::WARN
     timestamp false
@@ -42,5 +42,8 @@ module GroceryDelivery
     vcs_type 'svn'
     vcs_path nil
     plugin_path '/etc/gd-plugin.rb'
+    berks false
+    berks_bin '/opt/chefdk/bin/berks'
+    berks_config nil
   end
 end

data/lib/grocery_delivery/hooks.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/grocery_delivery/logging.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.
@@ -33,13 +33,17 @@ module GroceryDelivery
       @@level = val
     end
 
+    def self.stdout=(val)
+      @@stdout = val
+    end
+
     def self.logit(level, msg)
       init unless @@init
       # You can't do `Syslog.log(level, msg)` because if there is a
       # `%` in `msg` then ruby will interpret it as a printf string and
       # expect more arguments to log().
       Syslog.log(level, '%s', msg)
-      puts msg if $stdout.tty?
+      puts msg if $stdout.tty? || @@stdout
     end
 
     def self.debug(msg)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grocery_delivery
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Phil Dibowitz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-05 00:00:00 Z
+date: 2015-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: between_meals
+  name: between_meals >= 0.0.6
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,6 +46,48 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rubocop
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: knife-solo
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: chef-zero
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Utility for keeping Chef servers in sync with a repo
 email: 
 executables: 
@@ -59,8 +101,8 @@ files:
 - README.md
 - LICENSE
 - lib/grocery_delivery/hooks.rb
-- lib/grocery_delivery/config.rb
 - lib/grocery_delivery/logging.rb
+- lib/grocery_delivery/config.rb
 - bin/grocery-delivery
 homepage: 
 licenses: