grocery_delivery 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3051aeb9cd63a75f10ecb857a43377e4499c023
-  data.tar.gz: d7e72bbf0374b09b147a8359571edd224df5ec96
+SHA256:
+  metadata.gz: f337a09319eafef3f7c95d9fd358468a320c6912c580c9ec52fb59ab74203b44
+  data.tar.gz: 56bb4c32c4be6387fded401705215f699d17ba9d8ee90a1825e6bfefd5566fbb
 SHA512:
-  metadata.gz: 1f4dd7577e4db07e06f63f8c0f6f52c6b1445d0ecf5c1acc5ea826584ce93e2f23828e26684290db0787fd45b57052b6d4993c7a903b92de238125e38c2cee05
-  data.tar.gz: 1f8dfac08aa55dec215bfea8e5cee97f8dee0307b5ffa8efe39b8a353e1df1220980fc4b1557982e220e086eb336dd4ef8c53392bd9e964e4cb2b1c24fab1451
+  metadata.gz: 110709d96037e3dec5636b43d2b4324dbeef043e5ec6476142c4a28023e5f18d9a90e8b8e5e24cf8126db0018bc4397bf66d563835199bb2783710061372570f
+  data.tar.gz: 35c38494431c9af2f7e1bdffd5a023160fa8744b7e94600d128be8ccf62ed4f218f36c50e589ec891bc1a3684020468f6b4450c6135d6115875e326cf3d47b14

data/README.md

@@ -1,6 +1,6 @@
 # Grocery Delivery
 
-[![Build Status](https://travis-ci.org/facebook/grocery-delivery.svg)](http://travis-ci.org/facebook/grocery-delivery)
+![Continuous Integration](https://github.com/facebook/grocery-delivery/workflows/Continuous%20Integration/badge.svg?event=push)
 
 ## Intro
 Ohai!
@@ -29,12 +29,12 @@ principals:
 * You want all your chef-servers in sync
 * Everything you care about comes from version control.
 
-We recommend using the whitelist_node_attrs
-(https://github.com/opscode/whitelist-node-attrs) cookbook to prevent node
-attributes being saved back to the server. Or in recent versions of Chef 11,
-this feature is built-in:
-
-http://docs.getchef.com/essentials_node_object.html#whitelist-attributes
+We recommend enabling attributes whitelisting to prevent node attributes being
+saved back to the server. In recent versions of Chef (past Chef 11), this
+feature is [built-in](https://docs.chef.io/nodes/#whitelist-attributes). For
+older versions, we recommend using the
+[`whitelist_node_attrs`](https://github.com/chef-boneyard/whitelist-node-attrs)
+cookbook.
 
 ## Dependencies
 
@@ -43,7 +43,7 @@ http://docs.getchef.com/essentials_node_object.html#whitelist-attributes
 
 ## Config file
 
-The default config file is `/etc/gd-config.rb` but you may use -c to specify
+The default config file is `/etc/gd-config.rb` but you may use `-c` to specify
 another. The config file works the same as client.rb does for Chef - there
 are a series of keywords that take an argument and anything else is just
 standard Ruby.
@@ -56,37 +56,38 @@ All command-line options are available in the config file:
 * pidfile (string, default: `/var/run/grocery_delivery.pid`)
 
 In addition the following are also available:
-* master_path - The top-level path for Grocery Delivery's work. Most other
+* `master_path` - The top-level path for Grocery Delivery's work. Most other
   paths are relative to this. Default: `/var/chef/grocery_delivery_work`
-* repo_url - The URL to clone/checkout if it doesn't exist. Default: `nil`
-* reponame - The relative directory to check the repo out to, inside of
+* `repo_url` - The URL to clone/checkout if it doesn't exist. Default: `nil`
+* `reponame` - The relative directory to check the repo out to, inside of
   `master_path`. Default: `ops`
-* cookbook_paths - An array of directories that contain cookbooks relative to
+* `cookbook_paths` - An array of directories that contain cookbooks relative to
   `reponame`. Default: `['chef/cookbooks']`
-* role_path - A directory to find roles in relative to `reponame`. Default:
+* `role_path` - A directory to find roles in relative to `reponame`. Default:
   `'chef/roles'`
-* databag_path - A directory to find databags in relative to `reponame`.
+* `role_type` - RB or JSON roles? Default: `rb`
+* `databag_path` - A directory to find databags in relative to `reponame`.
   Default: `'chef/databags'`
-* rev_checkpoint - Name of the file to store the last-uploaded revision,
+* `rev_checkpoint` - Name of the file to store the last-uploaded revision,
   relative to `reponame`. Default: `gd_revision`
-* knife_config - Knife config to use for uploads. Default:
+* `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'.
+* `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
+* `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`
+* `berks_bin` - Path to berkshelf. Default: `/opt/chefdk/bin/berks`
 
 ## Plugin
 
 The plugin should be a ruby file which defines several class methods. It is
-class_eval()d into a Hooks class.
+`class_eval()`d into a `Hooks` class.
 
 The following functions can optionally be defined:
 
@@ -108,7 +109,7 @@ to parse it.
 
 * self.postrun(dryrun, success, msg)
 
-After we've parsed the updates to the repo and uploaded/deleted the relevent
+After we've parsed the updates to the repo and uploaded/deleted the relevant
 items from the local server. `Success` is a bool for whether we succeeded, and
 `msg` is the status message - either the revision we sync'd or an error.
 
@@ -116,3 +117,7 @@ items from the local server. `Success` is a bool for whether we succeeded, and
 
 Same as postrun, but is registered as an atexit function so it happens even
 if we crash.
+
+## License
+
+See the `LICENSE` file in this repo.

data/bin/grocery-delivery

@@ -62,7 +62,7 @@ end
 
 def read_checkpoint
   GroceryDelivery::Log.debug("Reading #{checkpoint_path}")
-  File.exists?(checkpoint_path) ? File.read(checkpoint_path).strip : nil
+  File.exist?(checkpoint_path) ? File.read(checkpoint_path).strip : nil
 end
 
 def full_upload(knife)
@@ -84,7 +84,7 @@ end
 
 def partial_upload(knife, repo, checkpoint, local_head)
   GroceryDelivery::Log.warn(
-    "Determing changes... from #{checkpoint} to #{local_head}",
+    "Determining changes... from #{checkpoint} to #{local_head}",
   )
 
   begin
@@ -191,7 +191,7 @@ def setup_config
       end
     end
     opts.on('-c', '--config-file FILE', 'config file') do |s|
-      unless File.exists?(File.expand_path(s))
+      unless File.exist?(File.expand_path(s))
         GroceryDelivery::Log.error("Config file #{s} not found.")
         exit(2)
       end
@@ -207,7 +207,7 @@ def setup_config
       options[:pidfile] = s
     end
   end.parse!
-  if File.exists?(File.expand_path(options[:config_file]))
+  if File.exist?(File.expand_path(options[:config_file]))
     GroceryDelivery::Config.from_file(options[:config_file])
   end
   GroceryDelivery::Config.merge!(options)

data/lib/grocery_delivery/hooks.rb

@@ -40,7 +40,7 @@ module GroceryDelivery
     def self.atexit(_dryrun, _success, _msg); end
 
     def self.get(file)
-      class_eval(File.read(file), file, 1) if File.exists?(file)
+      class_eval(File.read(file), file, 1) if File.exist?(file)
     end
   end
 end

data/lib/grocery_delivery/logging.rb

@@ -29,6 +29,10 @@ module GroceryDelivery
       @@init = true
     end
 
+    def self.level
+      @@level
+    end
+
     def self.verbosity=(val)
       @@level = val
     end
@@ -48,25 +52,25 @@ module GroceryDelivery
 
     def self.debug(msg)
       if @@level == Logger::DEBUG
-        msg.prepend('DEBUG: ')
+        msg.to_s.prepend('DEBUG: ')
         logit(Syslog::LOG_DEBUG, msg)
       end
     end
 
     def self.info(msg)
       if @@level == Logger::INFO
-        msg.prepend('INFO: ')
+        msg.to_s.prepend('INFO: ')
         logit(Syslog::LOG_INFO, msg)
       end
     end
 
     def self.warn(msg)
-      msg.prepend('WARN: ')
+      msg.to_s.prepend('WARN: ')
       logit(Syslog::LOG_WARNING, msg)
     end
 
     def self.error(msg)
-      msg.prepend('ERROR: ')
+      msg.to_s.prepend('ERROR: ')
       logit(Syslog::LOG_ERR, msg)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grocery_delivery
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2020-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: between_meals
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: knife-solo
+  name: chef-dk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +68,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,6 +109,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.55.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.55.0
 description: Utility for keeping Chef servers in sync with a repo
 email: 
 executables:
@@ -115,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Grocery Delivery