thegarage-gitx 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d556d4767bbd711d406930510b698a1811e063c
-  data.tar.gz: 4b71eb5f631cf5b9d134ab842df9136321ca2601
+  metadata.gz: 9c042898972c5d2092ec9f3a579a75e32c448a95
+  data.tar.gz: a8b5e3cd62170304f12cfdb4000e2325ad77325d
 SHA512:
-  metadata.gz: 3baa98bde329c5ef4d7aa54610aa5393ef4899d7ed28e4558bad31df5d135f918983974947acea1f0a2f3db56d57506f2cf3696aaf7c44fae7095f9e9c90e0b0
-  data.tar.gz: 1d16107432222b84b7942a9be5af7be1875c15bd794432221667daaf0a8738155b740ab671cb13d9ea0488b9edcec0e35b5b069dd9fd757b6addbf412fec9348
+  metadata.gz: a0aca7c57d79390ecfc96913132303a830fa258f6e3dd5d0a5f26de44b584a5cb840324f14ee160b06127cb37c8068eeaad86c5a6ff315fa3b23945ee35db624
+  data.tar.gz: cb4eed326c8c2ddeb0554d88a8722c84a06e40aab83856f0ee61051a13c9a061ce0b565f9da71b1b8d82b6d56c22a0b6d13f561c472edb72ca3aaac7f5c3b6d8

data/lib/thegarage/gitx.rb

@@ -1,4 +1,5 @@
 require 'thegarage/gitx/version'
+require 'thegarage/gitx/configuration'
 require 'thegarage/gitx/extensions/string'
 require 'thegarage/gitx/extensions/thor'
 

data/lib/thegarage/gitx/cli/base_command.rb

@@ -11,8 +11,6 @@ module Thegarage
 
         class MergeError < Thor::Error; end
 
-        AGGREGATE_BRANCHES = %w( staging prototype )
-        RESERVED_BRANCHES = %w( HEAD master next_release ) + AGGREGATE_BRANCHES
         add_runtime_options!
 
         method_option :trace, :type => :boolean, :aliases => '-v'
@@ -38,18 +36,22 @@ module Thegarage
           repo.branches.find(&:head?)
         end
 
-        def aggregate_branch?(branch)
-          AGGREGATE_BRANCHES.include?(branch)
+        def assert_aggregate_branch!(target_branch)
+          fail "Invalid aggregate branch: #{target_branch} must be one of supported aggregate branches #{config.aggregate_branches}" unless config.aggregate_branch?(target_branch)
         end
 
         def assert_not_protected_branch!(branch, action)
-          raise "Cannot #{action} reserved branch" if RESERVED_BRANCHES.include?(branch) || aggregate_branch?(branch)
+          raise "Cannot #{action} reserved branch" if config.reserved_branch?(branch) || config.aggregate_branch?(branch)
         end
 
         # helper to invoke other CLI commands
         def execute_command(command_class, method, args = [])
           command_class.new.send(method, *args)
         end
+
+        def config
+          @configuration ||= Thegarage::Gitx::Configuration.new(repo.workdir)
+        end
       end
     end
   end

data/lib/thegarage/gitx/cli/buildtag_command.rb

@@ -6,12 +6,11 @@ module Thegarage
   module Gitx
     module Cli
       class BuildtagCommand < BaseCommand
-        TAGGABLE_BRANCHES = %w( master staging )
 
         desc 'buildtag', 'create a tag for the current build and push it back to origin (supports Travis CI and Codeship)'
         def buildtag
           fail "Unknown branch. Environment variables TRAVIS_BRANCH or CI_BRANCH are required" unless branch_name
-          fail "Branch must be one of the supported taggable branches: #{TAGGABLE_BRANCHES}" unless TAGGABLE_BRANCHES.include?(branch_name)
+          fail "Branch must be one of the supported taggable branches: #{config.taggable_branches}" unless config.taggable_branch?(branch_name)
 
           label = "buildtag generated by build #{build_number}"
           create_build_tag(branch_name, label)

data/lib/thegarage/gitx/cli/cleanup_command.rb

@@ -36,8 +36,8 @@ module Thegarage
             branch
           end
           branches.uniq!
-          branches -= RESERVED_BRANCHES
-          branches.reject! { |b| aggregate_branch?(b) }
+          branches -= config.reserved_branches
+          branches.reject! { |b| config.aggregate_branch?(b) }
 
           branches
         end

data/lib/thegarage/gitx/cli/integrate_command.rb

@@ -26,7 +26,7 @@ module Thegarage
           integrate_branch(branch, integration_branch) unless options[:resume]
           checkout_branch branch
 
-          create_integrate_comment(branch) unless RESERVED_BRANCHES.include?(branch)
+          create_integrate_comment(branch) unless config.reserved_branch?(branch)
         end
 
         private
@@ -59,10 +59,6 @@ module Thegarage
           end
         end
 
-        def assert_aggregate_branch!(target_branch)
-          fail "Invalid aggregate branch: #{target_branch} must be one of supported aggregate branches #{AGGREGATE_BRANCHES}" unless aggregate_branch?(target_branch)
-        end
-
         # nuke local branch and pull fresh version from remote repo
         def fetch_remote_branch(target_branch)
           create_remote_branch(target_branch) unless remote_branch_exists?(target_branch)

data/lib/thegarage/gitx/cli/nuke_command.rb

@@ -14,7 +14,7 @@ module Thegarage
 
           last_known_good_tag = current_build_tag(good_branch)
           return unless yes?("Reset #{bad_branch} to #{last_known_good_tag}? (y/n)", :green)
-          fail "Only aggregate branches are allowed to be reset: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(bad_branch)
+          assert_aggregate_branch!(bad_branch)
           return if migrations_need_to_be_reverted?(bad_branch, last_known_good_tag)
 
           say "Resetting "

data/lib/thegarage/gitx/configuration.rb

@@ -0,0 +1,47 @@
+require 'yaml'
+
+module Thegarage
+  module Gitx
+    class Configuration
+      DEFAULT_CONFIG = {
+        'aggregate_branches' => %w( staging prototype ),
+        'reserved_branches' => %w( HEAD master next_release staging prototype ),
+        'taggable_branches' => %w( master staging )
+      }
+      CONFIG_FILE = '.gitx.yml'
+
+      attr_reader :config
+
+      def initialize(root_dir)
+        @config = Thor::CoreExt::HashWithIndifferentAccess.new(DEFAULT_CONFIG)
+        config_file_path = File.join(root_dir, CONFIG_FILE)
+        if File.exists?(config_file_path)
+          @config.merge!(::YAML::load_file(config_file_path))
+        end
+      end
+
+      def aggregate_branches
+        config[:aggregate_branches]
+      end
+      def aggregate_branch?(branch)
+        aggregate_branches.include?(branch)
+      end
+
+      def reserved_branches
+        config[:reserved_branches]
+      end
+
+      def reserved_branch?(branch)
+        reserved_branches.include?(branch)
+      end
+
+      def taggable_branches
+        config[:taggable_branches]
+      end
+
+      def taggable_branch?(branch)
+        taggable_branches.include?(branch)
+      end
+    end
+  end
+end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.11.0'
+    VERSION = '2.12.0'
   end
 end

data/spec/support/global_config.rb

@@ -1,21 +1,24 @@
 # helper for reading global config file
 module GlobalConfig
   def global_config_file
-    config_dir = File.join(__dir__, '../tmp/.config/gitx')
-    config_file = File.join(config_dir, 'github.yml')
+    config_file = File.join(temp_dir, '.config/gitx/github.yml')
+    config_dir = File.dirname(config_file)
     FileUtils.mkdir_p(config_dir) unless File.exists?(config_dir)
     config_file
   end
   def global_config
     YAML.load_file(global_config_file)
   end
+  def temp_dir
+    tmp_dir = File.join(__dir__, '../tmp')
+  end
 end
 
 RSpec.configure do |config|
   config.include GlobalConfig
 
   config.before do
-    tmp_dir = File.join(__dir__, '../tmp')
-    FileUtils.rm_rf(tmp_dir)
+    FileUtils.rm_rf(temp_dir)
+    FileUtils.mkdir_p(temp_dir)
   end
 end

data/spec/support/home_env.rb

@@ -3,7 +3,7 @@
 RSpec.configure do |config|
   config.before do
     @old_home = ENV['HOME']
-    ENV['HOME'] = File.join(__dir__, '../tmp')
+    ENV['HOME'] = temp_dir
   end
   config.after do
     ENV['HOME'] = @old_home

data/spec/thegarage/gitx/cli/base_command_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'thegarage/gitx/cli/base_command'
+
+describe Thegarage::Gitx::Cli::BaseCommand do
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) do
+    {
+      pretend: true
+    }
+  end
+  let(:cli) { described_class.new(args, options, config) }
+  let(:repo) { cli.send(:repo) }
+
+  describe 'without custom .gitx.yml config file' do
+    it 'provides default options' do
+      expect(cli.send(:config).config).to eq Thegarage::Gitx::Configuration::DEFAULT_CONFIG
+    end
+  end
+
+  describe 'with custom .gitx.yml config file' do
+    let(:config) do
+      {
+        'aggregate_branches' => %w( foo bar ),
+        'reserved_branches' => %w( baz qux ),
+        'taggable_branches' => %w( quux corge )
+      }
+    end
+    before do
+      expect(repo).to receive(:workdir).and_return(temp_dir)
+      File.open(File.join(temp_dir, '.gitx.yml'), 'w') do |f|
+        f.puts config.to_yaml
+      end
+    end
+    it 'overrides default options' do
+      expect(cli.send(:config).aggregate_branches).to eq(%w( foo bar ))
+      expect(cli.send(:config).reserved_branches).to eq(%w( baz qux ))
+      expect(cli.send(:config).taggable_branches).to eq(%w( quux corge ))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -271,6 +271,7 @@ files:
 - lib/thegarage/gitx/cli/start_command.rb
 - lib/thegarage/gitx/cli/track_command.rb
 - lib/thegarage/gitx/cli/update_command.rb
+- lib/thegarage/gitx/configuration.rb
 - lib/thegarage/gitx/extensions/string.rb
 - lib/thegarage/gitx/extensions/thor.rb
 - lib/thegarage/gitx/github.rb
@@ -287,6 +288,7 @@ files:
 - spec/support/timecop.rb
 - spec/support/vcr.rb
 - spec/support/webmock.rb
+- spec/thegarage/gitx/cli/base_command_spec.rb
 - spec/thegarage/gitx/cli/buildtag_command_spec.rb
 - spec/thegarage/gitx/cli/cleanup_command_spec.rb
 - spec/thegarage/gitx/cli/integrate_command_spec.rb
@@ -335,6 +337,7 @@ test_files:
 - spec/support/timecop.rb
 - spec/support/vcr.rb
 - spec/support/webmock.rb
+- spec/thegarage/gitx/cli/base_command_spec.rb
 - spec/thegarage/gitx/cli/buildtag_command_spec.rb
 - spec/thegarage/gitx/cli/cleanup_command_spec.rb
 - spec/thegarage/gitx/cli/integrate_command_spec.rb