grocery_delivery 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b3051aeb9cd63a75f10ecb857a43377e4499c023
+  data.tar.gz: d7e72bbf0374b09b147a8359571edd224df5ec96
+SHA512:
+  metadata.gz: 1f4dd7577e4db07e06f63f8c0f6f52c6b1445d0ecf5c1acc5ea826584ce93e2f23828e26684290db0787fd45b57052b6d4993c7a903b92de238125e38c2cee05
+  data.tar.gz: 1f8dfac08aa55dec215bfea8e5cee97f8dee0307b5ffa8efe39b8a353e1df1220980fc4b1557982e220e086eb336dd4ef8c53392bd9e964e4cb2b1c24fab1451

data/README.md

@@ -51,7 +51,6 @@ standard Ruby.
 All command-line options are available in the config file:
 * dry_run (bool, default: false)
 * debug (bool, default: false)
-* timestamp (bool, default: false)
 * config_file (string, default: `/etc/gd-config.rb`)
 * lockfile (string, default: `/var/lock/subsys/grocery_delivery`)
 * pidfile (string, default: `/var/run/grocery_delivery.pid`)
@@ -65,9 +64,9 @@ In addition the following are also available:
 * 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:
-  `['chef/roles']`
+  `'chef/roles'`
 * databag_path - A directory to find databags in relative to `reponame`.
-  Default: `['chef/databags']`
+  Default: `'chef/databags'`
 * 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:
@@ -80,7 +79,7 @@ In addition the following are also available:
 * 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 
+* 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`
 

data/bin/grocery-delivery

@@ -42,7 +42,7 @@ end
 def get_lock
   GroceryDelivery::Log.warn('Attempting to acquire lock')
   $lockfileh = File.open(GroceryDelivery::Config.lockfile,
-                         File::RDWR | File::CREAT, 0600)
+                         File::RDWR | File::CREAT, 0o600)
   $lockfileh.flock(File::LOCK_EX)
   GroceryDelivery::Log.warn('Lock acquired')
 end
@@ -69,7 +69,7 @@ def full_upload(knife)
   if GroceryDelivery::Config.berks
     GroceryDelivery::Log.warn('Uploading all cookbooks with berkshelf')
     GroceryDelivery::Log.debug(
-      "Using cookbook paths: #{GroceryDelivery::Config.cookbook_paths}"
+      "Using cookbook paths: #{GroceryDelivery::Config.cookbook_paths}",
     )
     knife.berks_cookbook_upload_all
   else
@@ -84,7 +84,7 @@ end
 
 def partial_upload(knife, repo, checkpoint, local_head)
   GroceryDelivery::Log.warn(
-    "Determing changes... from #{checkpoint} to #{local_head}"
+    "Determing changes... from #{checkpoint} to #{local_head}",
   )
 
   begin
@@ -101,6 +101,7 @@ def partial_upload(knife, repo, checkpoint, local_head)
         :databag_dir =>
           GroceryDelivery::Config.databag_path,
       },
+      GroceryDelivery::Config.track_symlinks,
     )
   rescue BetweenMeals::Changeset::ReferenceError
     GroceryDelivery::Log.error('Repo error, invalid revision, exiting')
@@ -128,11 +129,13 @@ def partial_upload(knife, repo, checkpoint, local_head)
   end
 
   knife.cookbook_delete(deleted_cookbooks) if deleted_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
+  if added_cookbooks
+    if GroceryDelivery::Config.berks
+      GroceryDelivery::Log.warn('Using Berkshelf to upload cookbooks')
+      knife.berks_cookbook_upload(added_cookbooks)
+    else
+      knife.cookbook_upload(added_cookbooks)
+    end
   end
   knife.role_delete(deleted_roles) if deleted_roles
   knife.role_upload(added_roles) if added_roles
@@ -153,11 +156,15 @@ def upload_changed(repo, checkpoint)
       :berks_bin => GroceryDelivery::Config.berks_bin,
       :berks_config => GroceryDelivery::Config.berks_config,
       :role_dir => File.join(base_dir, GroceryDelivery::Config.role_path),
+      :role_type => GroceryDelivery::Config.role_type,
       :cookbook_dirs => GroceryDelivery::Config.cookbook_paths.map do |x|
         File.join(base_dir, x)
       end,
       :databag_dir => File.join(base_dir, GroceryDelivery::Config.databag_path),
-    }
+    },
+  )
+  GroceryDelivery::Hooks.pre_upload(
+    GroceryDelivery::Config.dry_run, knife, local_head
   )
 
   if checkpoint
@@ -183,9 +190,6 @@ def setup_config
         options[:verbosity] = ::Logger::INFO
       end
     end
-    opts.on('-T', '--timestamp', 'Timestamp output') do |s|
-      options[:timestamp] = s
-    end
     opts.on('-c', '--config-file FILE', 'config file') do |s|
       unless File.exists?(File.expand_path(s))
         GroceryDelivery::Log.error("Config file #{s} not found.")
@@ -246,7 +250,7 @@ if repo.exists?
 else
   unless GroceryDelivery::Config.repo_url
     GroceryDelivery::Log.error(
-      'No repo URL was specified, and no repo is checked out'
+      'No repo URL was specified, and no repo is checked out',
     )
     exit(1)
   end
@@ -260,7 +264,7 @@ GroceryDelivery::Hooks.post_repo_up(GroceryDelivery::Config.dry_run)
 
 if GroceryDelivery::Config.dry_run && !repo.exists?
   GroceryDelivery::Log.warn(
-    'In dryrun mode, with no repo, there\'s not much I can dryrun'
+    'In dryrun mode, with no repo, there\'s not much I can dryrun',
   )
   GroceryDelivery::Hooks.postrun(GroceryDelivery::Config.dry_run, true,
                                  'dryrun mode')
@@ -278,7 +282,7 @@ else
     write_checkpoint(ver)
     $success = true
     $status_msg = "Success at #{ver}"
-  rescue => e
+  rescue StandardError => e
     $status_msg = e.message
     e.backtrace.each do |line|
       GroceryDelivery::Log.error(line)
@@ -289,4 +293,5 @@ end
 GroceryDelivery::Log.warn($status_msg)
 GroceryDelivery::Hooks.postrun(GroceryDelivery::Config.dry_run, $success,
                                $status_msg)
+exit($success)
 # rubocop:enable GlobalVars

data/lib/grocery_delivery/config.rb

@@ -26,7 +26,6 @@ module GroceryDelivery
     stdout false
     dry_run false
     verbosity Logger::WARN
-    timestamp false
     config_file '/etc/gd-config.rb'
     pidfile '/var/run/grocery_delivery.pid'
     lockfile '/var/lock/subsys/grocery_delivery'
@@ -35,6 +34,7 @@ module GroceryDelivery
     reponame 'ops'
     cookbook_paths ['chef/cookbooks']
     role_path 'chef/roles'
+    role_type 'rb'
     databag_path 'chef/databags'
     rev_checkpoint 'gd_revision'
     knife_config '/root/.chef/knife.rb'
@@ -45,5 +45,6 @@ module GroceryDelivery
     berks false
     berks_bin '/opt/chefdk/bin/berks'
     berks_config nil
+    track_symlinks false
   end
 end

data/lib/grocery_delivery/hooks.rb

@@ -19,30 +19,28 @@ module GroceryDelivery
   class Hooks
     # This code will run once we've read our config and loaded our plugins
     # but before *anything* else. We don't even have a lock yet.
-    def self.preflight_checks(_dryrun)
-    end
+    def self.preflight_checks(_dryrun); end
 
     # This is run after we've gotten a lock, written a pidfile and initialized
     # our repo object (but not touched the repo yet)
-    def self.prerun(_dryrun)
-    end
+    def self.prerun(_dryrun); end
 
     # This is code to run after we've updated the repo, but before we've done
     # any work to parse it.
-    def self.post_repo_up(_dryrun)
-    end
+    def self.post_repo_up(_dryrun); end
+
+    # This is code to run after right before we start uploads
+    def self.pre_upload(_dryrun, _knife, _local_head); end
 
     # After we parse the updates to the repo and uploaded/deleted the relevent
     # items from the local server.
-    def self.postrun(_dryrun, _success, _msg)
-    end
+    def self.postrun(_dryrun, _success, _msg); end
 
     # exit hooks.
-    def self.atexit(_dryrun, _success, _msg)
-    end
+    def self.atexit(_dryrun, _success, _msg); end
 
     def self.get(file)
-      class_eval(File.read(file), __FILE__, __LINE__) if File.exists?(file)
+      class_eval(File.read(file), file, 1) if File.exists?(file)
     end
   end
 end

metadata

@@ -1,143 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: grocery_delivery
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Phil Dibowitz
 - Marcin Sawicki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-11-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mixlib-config
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2017-12-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: between_meals
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: between_meals
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: mixlib-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rubocop
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef-zero
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        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: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: knife-solo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        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: 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utility for keeping Chef servers in sync with a repo
 email: 
-executables: 
+executables:
 - grocery-delivery
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
-- README.md
+files:
 - LICENSE
+- README.md
+- bin/grocery-delivery
+- lib/grocery_delivery/config.rb
 - lib/grocery_delivery/hooks.rb
 - lib/grocery_delivery/logging.rb
-- lib/grocery_delivery/config.rb
-- bin/grocery-delivery
 homepage: 
-licenses: 
+licenses:
 - Apache
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Grocery Delivery
 test_files: []
-