herdsman 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18f584c60859f1587dd80aaa46f302cab09efb6
-  data.tar.gz: e8a287c600b82bea7fed32924ab6779b3557e77c
+  metadata.gz: 671abc7a1456abb0f6b965c1de032a91c7a678ab
+  data.tar.gz: 343cc6f845a7ad9c017e2aa29aa155f81bbf8d2b
 SHA512:
-  metadata.gz: 4413b1e186657cd9dbc41be92e6530b509e022fdf1bc1cb604c022a58dcec676acca1f7f67db6ffccf0edfc4f5b43988670d5bfb12787b8cf136b4d5fbf912d2
-  data.tar.gz: 80d372ceb0e04bf9baf7775bdf404a6708b7c8ea4bc894ecc0d26e5e4f8ba8b894ea9fa988a9811806441f7e22ec66fce982171031026468ed7d8c69c8661432
+  metadata.gz: 1afcd2f8347b4528c307b12d4efb83ef93ba24c074b8bf1ca758ab95b45619877b479bb7115793c4e30ef407624a19b8d1a7316f442a3727a8f71187c7d22b39
+  data.tar.gz: a572e348727502c4c6b35bd93d3849f8ad17afaf2ae0983831c8b9a26769c66048fd02b25d4196dc1c3a528e82e798b026901ca006fd43c16f402c0cc791ea98

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Change Log
+
+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.2.0] - 2017-03-01
+
+### Added
+
+* `repositories:` alias for `repos:` config.
+* Optional `fetch_cache:` property to `repos:` config.
+* Optional `name:` property to `repos:` config.
+
+## v0.1.0 - 2017-02-20
+
+### Added
+
+* `herdsman.yml` config file with `repos:` config, with `path:` and optional `revision:` properties for each repo.
+* `status` command.
+* `version` command.
+* `--quiet`/`-q` option.
+
+[Unreleased]: https://github.com/tommarshall/herdsman/compare/v0.2.0...HEAD
+[v0.2.0]: https://github.com/tommarshall/herdsman/compare/v0.1.0...v0.2.0

data/README.md

@@ -1,5 +1,10 @@
 # Herdsman
 
+[![Gem Version](http://img.shields.io/gem/v/herdsman.svg)](https://rubygems.org/gems/herdsman)
+[![Build Status](https://travis-ci.org/tommarshall/herdsman.svg?branch=master)](https://travis-ci.org/tommarshall/herdsman)
+[![Code Climate](https://codeclimate.com/github/tommarshall/herdsman/badges/gpa.svg)](https://codeclimate.com/github/tommarshall/herdsman)
+[![Test Coverage](https://codeclimate.com/github/tommarshall/herdsman/badges/coverage.svg)](https://codeclimate.com/github/tommarshall/herdsman/coverage)
+
 Herdsman is a command line utility for working with multiple Git repositories.
 
 ## Installation
@@ -52,7 +57,9 @@ repos:
   - /path/to/foo-repo
   - ../../path/to/bar-repo
   - path: /path/to/baz-repo
+    name: 'Baz repo'        # defaults to basename of path if unset, i.e. `baz-repo`
     revision: qux-branch    # defaults to `master` if unset
+    fetch_cache: 300        # in seconds, defaults to `0` if unset
 ```
 
 ## License

data/lib/herdsman/cli.rb

@@ -49,10 +49,10 @@ module Herdsman
     end
 
     def herd_members(repos)
-      repos.map do |repo|
+      repos.map do |herd_member_config|
         Herdsman::HerdMember.new(
-          Herdsman::GitRepo.new(env, repo.path),
-          repo.revision,
+          Herdsman::GitRepo.new(env, herd_member_config.path),
+          herd_member_config,
         )
       end
     end

data/lib/herdsman/config.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'herdsman/herd_member_config'
 
 module Herdsman
   class Config
@@ -8,9 +9,9 @@ module Herdsman
     end
 
     def repos
-      config_repos = config['repos'] || []
-      config_repos.map do |repo_config|
-        RepoConfig.new(repo_config)
+      config_repos = config['repos'] || config['repositories'] || []
+      config_repos.map do |herd_member_config|
+        HerdMemberConfig.new(herd_member_config)
       end
     end
 
@@ -18,36 +19,6 @@ module Herdsman
 
     attr_reader :config
 
-    class RepoConfig
-      def initialize(repo_config)
-        @repo_config = repo_config
-      end
-
-      def path
-        if repo_config.is_a?(Hash)
-          repo_config['path']
-        else
-          repo_config
-        end
-      end
-
-      def revision
-        if repo_config.is_a?(Hash) && repo_config.include?('revision')
-          repo_config['revision']
-        else
-          default_revision
-        end
-      end
-
-      private
-
-      attr_reader :repo_config
-
-      def default_revision
-        'master'
-      end
-    end
-
     def read_config!(path)
       YAML.load_file(path)
     rescue

data/lib/herdsman/git_repo.rb

@@ -16,6 +16,11 @@ module Herdsman
       git_output('rev-parse --git-dir')
     end
 
+    def fetch!
+      _, _, proc_status = git_command('fetch --all')
+      raise 'Fetch failed' unless proc_status.exitstatus.zero?
+    end
+
     def current_head
       current_branch_name || current_tag_name || abbreviated_commit_ref
     end
@@ -33,7 +38,6 @@ module Herdsman
     end
 
     def has_unpulled_commits?
-      fetch
       git_output('log --oneline ..@{u}').lines.any?
     end
 
@@ -43,6 +47,12 @@ module Herdsman
       )
     end
 
+    def last_fetched
+      File.mtime(File.join(File.expand_path(path, Dir.pwd), '.git/FETCH_HEAD'))
+    rescue
+      Time.at(0)
+    end
+
     private
 
     attr_reader :env
@@ -66,20 +76,16 @@ module Herdsman
       StatusParser.new(git_output('status --porcelain'))
     end
 
-    def fetch
-      git_output('fetch --all')
+    def git_output(command)
+      git_command(command).first.chomp
     end
 
-    def git_output(command)
+    def git_command(command)
       Dir.chdir(File.expand_path(path, Dir.pwd)) do
-        Open3.capture3(git_command(command)).first.chomp
+        Open3.capture3("#{env.git_command} #{command}")
       end
     end
 
-    def git_command(sub_command)
-      "#{env.git_command} #{sub_command}"
-    end
-
     class StatusParser
       def initialize(status_porcelain)
         @status_porcelain = status_porcelain

data/lib/herdsman/herd_member.rb

@@ -1,10 +1,8 @@
 module Herdsman
   class HerdMember
-    attr_reader :name
-    def initialize(repo, revision, args = {})
-      @repo     = repo
-      @revision = revision
-      @name     = args[:name] || default_name
+    def initialize(repo, config)
+      @repo   = repo
+      @config = config
     end
 
     def gathered?
@@ -24,11 +22,7 @@ module Herdsman
 
     private
 
-    attr_reader :repo, :revision
-
-    def default_name
-      File.basename(repo.path)
-    end
+    attr_reader :repo, :config
 
     Message = Struct.new(:level, :msg)
 
@@ -40,6 +34,28 @@ module Herdsman
       @messages = []
     end
 
+    def name
+      config.name
+    end
+
+    def revision
+      config.revision
+    end
+
+    def fetch_cache
+      config.fetch_cache
+    end
+
+    def fetch_cached?
+      Time.now - repo.last_fetched < fetch_cache
+    end
+
+    def repo_fetch!
+      repo.fetch!
+    rescue
+      messages << Message.new(:warn, "#{name} failed to fetch")
+    end
+
     def repo_initialized?
       unless repo.initialized?
         messages << Message.new(:warn, "#{repo.path} is not a git repo")
@@ -55,6 +71,7 @@ module Herdsman
     end
 
     def repo_has_zero_unpulled_commits?
+      repo_fetch! unless fetch_cached?
       if repo.has_unpulled_commits?
         messages << Message.new(:warn, "#{name} has unpulled commits")
       end

data/lib/herdsman/herd_member_config.rb

@@ -0,0 +1,52 @@
+module Herdsman
+  class HerdMemberConfig
+    def initialize(args = {})
+      @args = args
+      validate!
+    end
+
+    def path
+      args.fetch('path')
+    rescue
+      args
+    end
+
+    def name
+      args.fetch('name')
+    rescue
+      default_name
+    end
+
+    def revision
+      args.fetch('revision')
+    rescue
+      default_revision
+    end
+
+    def fetch_cache
+      args.fetch('fetch_cache').to_i
+    rescue
+      default_fetch_cache
+    end
+
+    private
+
+    attr_reader :args
+
+    def default_name
+      File.basename(path)
+    end
+
+    def default_revision
+      'master'
+    end
+
+    def default_fetch_cache
+      0
+    end
+
+    def validate!
+      raise 'Invalid repo config, path is required' unless path.is_a?(String)
+    end
+  end
+end

data/lib/herdsman/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herdsman
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Herdsman is a CLI utility for working with multiple Git repositories
 email: tommarshall7@gmail.com
@@ -17,6 +17,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - README.md
 - bin/herdsman
 - herdsman.gemspec
@@ -28,6 +29,7 @@ files:
 - lib/herdsman/git_repo.rb
 - lib/herdsman/herd.rb
 - lib/herdsman/herd_member.rb
+- lib/herdsman/herd_member_config.rb
 - lib/herdsman/log_adapter.rb
 - lib/herdsman/version.rb
 homepage: https://github.com/tommarshall/herdsman
@@ -50,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A CLI utility for working with multiple Git repositories