herdsman 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 671abc7a1456abb0f6b965c1de032a91c7a678ab
-  data.tar.gz: 343cc6f845a7ad9c017e2aa29aa155f81bbf8d2b
+  metadata.gz: 8828c60f07d2f88386232fa85465bc2f1dadeaed
+  data.tar.gz: 408b35de658e9e9d8077f05f6af66873cdf74e3d
 SHA512:
-  metadata.gz: 1afcd2f8347b4528c307b12d4efb83ef93ba24c074b8bf1ca758ab95b45619877b479bb7115793c4e30ef407624a19b8d1a7316f442a3727a8f71187c7d22b39
-  data.tar.gz: a572e348727502c4c6b35bd93d3849f8ad17afaf2ae0983831c8b9a26769c66048fd02b25d4196dc1c3a528e82e798b026901ca006fd43c16f402c0cc791ea98
+  metadata.gz: 6bd0851552c5d30dc23ca1a4f34c3c06f149b0ae28b799ace9a861b28fa4dd1b1d41b44a89717bc67cda51a69510108dac4e87941af9144eda6a7daa7ea42d37
+  data.tar.gz: b529b2e72ac88e0f1993b490d03f2d04c4feb11206bdd51d4d8e6734257ed8d3e9027b4cfba9add9c3d29c3d47687c138a9b49dff23be3d9f0bb949ed9554661

data/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v0.3.0] - 2017-04-17
+
+### Added
+
+* `--fetch-cache=SECONDS`/`-c` option.
+* `--revision`/`-r` option.
+* `defaults:` config with support for `revision:` and `fetch_cache:`.
+* Glob support for `path:`.
+
+### Fixed
+
+* Missing `thor` dependency in gemspec.
+
 ## [v0.2.0] - 2017-03-01
 
 ### Added
@@ -21,5 +34,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 * `version` command.
 * `--quiet`/`-q` option.
 
-[Unreleased]: https://github.com/tommarshall/herdsman/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/tommarshall/herdsman/compare/v0.3.0...HEAD
+[v0.3.0]: https://github.com/tommarshall/herdsman/compare/v0.2.0...v0.3.0
 [v0.2.0]: https://github.com/tommarshall/herdsman/compare/v0.1.0...v0.2.0

data/README.md

@@ -22,6 +22,8 @@ Commands:
   herdsman version         # Show the herdsman version
 
 Options:
+  c, [--fetch-cache=SECONDS]
+  r, [--revision=REVISION]
   q, [--quiet], [--no-quiet]
 ```
 
@@ -53,6 +55,10 @@ Configure the herd of repositories to manage with a `herdsman.yml` file in the c
 Example:
 
 ```yml
+defaults:
+  revision: not-master
+  fetch_cache: 300
+
 repos:
   - /path/to/foo-repo
   - ../../path/to/bar-repo

data/herdsman.gemspec

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 require 'herdsman/version'
 
 Gem::Specification.new do |spec|
+  spec.add_dependency 'thor', '~> 0.19.0'
   spec.authors       = ['Tom Marshall']
   spec.description   =
     'Herdsman is a CLI utility for working with multiple Git repositories'

data/lib/herdsman/cli.rb

@@ -4,6 +4,8 @@ module Herdsman
   class CLI < Thor
     require 'herdsman'
 
+    class_option :fetch_cache, type: :numeric, banner: 'SECONDS', aliases: :c
+    class_option :revision, type: :string, aliases: :r
     class_option :quiet, type: :boolean, aliases: :q
 
     default_task :status
@@ -24,12 +26,18 @@ module Herdsman
     private
 
     def config
-      Herdsman::Config.new(File.expand_path('herdsman.yml', Dir.pwd))
+      path = File.expand_path('herdsman.yml', Dir.pwd)
+      Herdsman::Config.new(path, config_overrides)
     rescue
       $stderr.puts "ERROR: #{$!.message}"
       exit 1
     end
 
+    def config_overrides
+      overridable_options = %w(fetch_cache revision)
+      options.select { |key, _| overridable_options.include? key }
+    end
+
     def env
       Herdsman::Environment.new
     end

data/lib/herdsman/config.rb

@@ -3,21 +3,24 @@ require 'herdsman/herd_member_config'
 
 module Herdsman
   class Config
-    def initialize(path)
-      @config = read_config!(path)
+    def initialize(path, overrides = {})
+      @config    = read_config!(path)
+      @overrides = overrides
       validate!
     end
 
     def repos
-      config_repos = config['repos'] || config['repositories'] || []
       config_repos.map do |herd_member_config|
-        HerdMemberConfig.new(herd_member_config)
-      end
+        args = herd_member_args(herd_member_config)
+        herd_member_paths(herd_member_config).map do |path|
+          HerdMemberConfig.new(path, args, overrides, config_defaults)
+        end
+      end.flatten
     end
 
     private
 
-    attr_reader :config
+    attr_reader :config, :overrides
 
     def read_config!(path)
       YAML.load_file(path)
@@ -25,6 +28,33 @@ module Herdsman
       raise 'No config found'
     end
 
+    def config_defaults
+      config.fetch('defaults')
+    rescue
+      {}
+    end
+
+    def config_repos
+      config['repos'] || config['repositories'] || []
+    end
+
+    def herd_member_paths(herd_member_config)
+      config_path = herd_member_path(herd_member_config)
+      Dir.glob(config_path).select { |fn| File.directory?(fn) }
+    end
+
+    def herd_member_path(herd_member_config)
+      herd_member_config.fetch('path')
+    rescue
+      herd_member_config
+    end
+
+    def herd_member_args(herd_member_config)
+      herd_member_config.select { |key, _| key != 'path' }
+    rescue
+      {}
+    end
+
     def validate!
       raise 'Invalid config' unless config.is_a?(Hash) && repos.is_a?(Array)
       raise 'No repos defined' if repos.empty?

data/lib/herdsman/herd.rb

@@ -2,8 +2,8 @@ module Herdsman
   class Herd
     attr_reader :members
     def initialize(env, config, members)
-      @env = env
-      @config = config
+      @env     = env
+      @config  = config
       @members = members
     end
 

data/lib/herdsman/herd_member_config.rb

@@ -1,16 +1,14 @@
 module Herdsman
   class HerdMemberConfig
-    def initialize(args = {})
-      @args = args
+    attr_reader :path
+    def initialize(path, args = {}, overrides = {}, defaults = {})
+      @path      = path
+      @args      = args
+      @overrides = overrides
+      @defaults  = defaults
       validate!
     end
 
-    def path
-      args.fetch('path')
-    rescue
-      args
-    end
-
     def name
       args.fetch('name')
     rescue
@@ -18,31 +16,43 @@ module Herdsman
     end
 
     def revision
-      args.fetch('revision')
+      overridable_arg('revision')
     rescue
       default_revision
     end
 
     def fetch_cache
-      args.fetch('fetch_cache').to_i
+      overridable_arg('fetch_cache').to_i
     rescue
       default_fetch_cache
     end
 
     private
 
-    attr_reader :args
+    attr_reader :args, :overrides, :defaults
 
     def default_name
       File.basename(path)
     end
 
     def default_revision
-      'master'
+      overridable_default('revision', 'master')
     end
 
     def default_fetch_cache
-      0
+      overridable_default('fetch_cache', 0)
+    end
+
+    def overridable_default(arg, default)
+      defaults.fetch(arg)
+    rescue
+      default
+    end
+
+    def overridable_arg(arg)
+      overrides.fetch(arg)
+    rescue
+      args.fetch(arg)
     end
 
     def validate!

data/lib/herdsman/version.rb

@@ -1,3 +1,3 @@
 module Herdsman
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: herdsman
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tom Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
-dependencies: []
+date: 2017-04-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.0
 description: Herdsman is a CLI utility for working with multiple Git repositories
 email: tommarshall7@gmail.com
 executables: