gitx 2.23.2 → 3.0.0.ci.188.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d3788b3cc004b033410f6a4351ba71d5df277fcd
-  data.tar.gz: a478fc1341ce8c2e5b0d791e4fa39484ee18b101
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTQ1NWFmZjkwMDExNGY5YzZiM2QzZTdjZmNmZmFiMWIyMDM3YTZiNQ==
+  data.tar.gz: !binary |-
+    NWZhMTM1OGRlZGYwNmMzMWYyY2EwNjUxMTNlNzhmMTBkNzMzZjkzMg==
 SHA512:
-  metadata.gz: dc50fbb52b5139dfeee2e8e9e073d7ab01937e04ce1b8e7a5df1e323154f3fd0073c0d27a05ff85cb3fedc037c8ca407052fbc7fc48d49de14cd49d7f6a761ec
-  data.tar.gz: 761c25d9d93706059dcb35eb2915d6093636ec1eaa4fc0298b9a21cfbf888920191dc354abc617808fbe1c8b7d470b1dc6d22e6021580d606f08bea2d5d4ae73
+  metadata.gz: !binary |-
+    ZjA5M2U3MmFjMmI4YWMxYjQ0ODc2MzQxYjQxMGFlYmFiY2YzY2I2OTk5Zjg5
+    MTMzZmRkYjZjZmI3ZjZmMjk4OTQ0MzU2MjYyYjY0NDk5NzFhZjUxYjc5YzZk
+    MzAyZDE1MTFlNjA1NmYwNjAwOTZjNWNhZmY1OGUyOTNhZDJjOWM=
+  data.tar.gz: !binary |-
+    YmQ4YzIzODRlNDA2NDNhNTgyY2YyNDhkN2JjMTUwOTdhOGJjZDNjOWM4ODhj
+    NzRiMDYxNzgxNWY3MDU4YTczNzU5ZmFjOTM0MDNkNWFkYTIwZDgyODE3ZDY4
+    ODhkNmM3ODJlNDU4MTc3ZDkzN2EzMTYzNzE0ZDkwNjEyNTc1NWE=

data/lib/gitx/cli/buildtag_command.rb

@@ -5,13 +5,16 @@ require 'gitx/cli/base_command'
 module Gitx
   module Cli
     class BuildtagCommand < BaseCommand
+      BUILD_TAG_PREFIX = 'builds'.freeze
+      BUILD_TAG_SEPARATOR = '/'.freeze
+
       desc 'buildtag', 'create a tag for the current build and push it back to origin (supports Travis CI and Codeship)'
       method_option :branch, type: :string, aliases: '-b', desc: 'branch name for build tag'
       method_option :message, type: :string, aliases: '-m', desc: 'message to attach to the buildtag'
       def buildtag
         raise "Branch must be one of the supported taggable branches: #{config.taggable_branches}" unless config.taggable_branch?(branch_name)
-        run_git_cmd 'tag', git_tag, '--annotate', '--message', label
-        run_git_cmd 'push', 'origin', git_tag
+        run_git_cmd 'tag', build_tag, '--annotate', '--message', label
+        run_git_cmd 'push', 'origin', build_tag
       end
 
       private
@@ -24,9 +27,16 @@ module Gitx
         options[:message] || "[gitx] buildtag for #{branch_name}"
       end
 
-      def git_tag
-        timestamp = Time.now.utc.strftime '%Y-%m-%d-%H-%M-%S'
-        "build-#{branch_name}-#{timestamp}"
+      def build_tag
+        @buildtag ||= [
+          BUILD_TAG_PREFIX,
+          branch_name,
+          utc_timestamp
+        ].join(BUILD_TAG_SEPARATOR)
+      end
+
+      def utc_timestamp
+        Time.now.utc.strftime '%Y-%m-%d-%H-%M-%S'
       end
     end
   end

data/lib/gitx/cli/nuke_command.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'gitx'
 require 'gitx/cli/base_command'
+require 'gitx/cli/buildtag_command'
 
 module Gitx
   module Cli
@@ -47,14 +48,15 @@ module Gitx
 
       def current_build_tag(branch)
         last_build_tag = build_tags_for_branch(branch).last
-        raise "No known good tag found for branch: #{branch}.  Verify tag exists via `git tag -l 'build-#{branch}-*'`" unless last_build_tag
+        raise "No known good tag found for branch: #{branch}.  Verify tag exists via `git tag -l`" unless last_build_tag
         last_build_tag
       end
 
       def build_tags_for_branch(branch)
         run_git_cmd 'fetch', '--tags'
-        build_tags = run_git_cmd('tag', '--list', "build-#{branch}-*").split
-        build_tags.sort
+        prefix = [BuildtagCommand::BUILD_TAG_PREFIX, branch].join(BuildtagCommand::BUILD_TAG_SEPARATOR)
+        tags = repo.tags.select { |t| t.name.starts_with?(prefix) }
+        tags.map(&:name).sort
       end
     end
   end

data/lib/gitx/extensions/string.rb

@@ -9,4 +9,9 @@ class String
   def blank?
     to_s == ''
   end
+
+  # @see http://apidock.com/rails/ActiveSupport/CoreExtensions/String/StartsEndsWith/starts_with%
+  def starts_with?(prefix)
+    prefix.respond_to?(:to_str) && self[0, prefix.length] == prefix
+  end
 end

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '2.23.2'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/spec/gitx/cli/buildtag_command_spec.rb

@@ -41,8 +41,8 @@ describe Gitx::Cli::BuildtagCommand do
       end
       before do
         Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
-          expect(executor).to receive(:execute).with('git', 'tag', 'build-master-2013-10-30-10-21-28', '--annotate', '--message', '[gitx] buildtag for master').ordered
-          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'build-master-2013-10-30-10-21-28').ordered
+          expect(executor).to receive(:execute).with('git', 'tag', 'builds/master/2013-10-30-10-21-28', '--annotate', '--message', '[gitx] buildtag for master').ordered
+          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'builds/master/2013-10-30-10-21-28').ordered
           cli.buildtag
         end
       end
@@ -59,8 +59,8 @@ describe Gitx::Cli::BuildtagCommand do
       end
       before do
         Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
-          expect(executor).to receive(:execute).with('git', 'tag', 'build-master-2013-10-30-10-21-28', '--annotate', '--message', 'custom git commit message').ordered
-          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'build-master-2013-10-30-10-21-28').ordered
+          expect(executor).to receive(:execute).with('git', 'tag', 'builds/master/2013-10-30-10-21-28', '--annotate', '--message', 'custom git commit message').ordered
+          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'builds/master/2013-10-30-10-21-28').ordered
           cli.buildtag
         end
       end

data/spec/gitx/cli/nuke_command_spec.rb

@@ -12,9 +12,13 @@ describe Gitx::Cli::NukeCommand do
   let(:cli) { described_class.new(args, options, config) }
   let(:executor) { cli.send(:executor) }
   let(:branch) { double('fake branch', name: 'feature-branch') }
+  let(:tags) { [] }
+  let(:workdir) { '.' }
+  let(:repo) { double(:repo, workdir: workdir, tags: tags) }
 
   before do
     allow(cli).to receive(:current_branch).and_return(branch)
+    allow(cli).to receive(:repo).and_return(repo)
   end
 
   describe '#nuke' do
@@ -26,16 +30,16 @@ describe Gitx::Cli::NukeCommand do
       end
       let(:good_branch) { 'master' }
       let(:bad_branch) { 'prototype' }
-      let(:buildtag) { 'build-master-2013-10-01-01' }
+      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:tags) { [buildtag] }
       before do
         expect(cli).to receive(:yes?).and_return(true)
 
-        expect(cli).to receive(:current_build_tag).with(good_branch).and_return(buildtag)
-
+        expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'build-master-2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/master/2013-10-01-01').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
 
@@ -48,17 +52,17 @@ describe Gitx::Cli::NukeCommand do
     context 'when target branch == prototype and destination prompt == nil' do
       let(:good_branch) { 'master' }
       let(:bad_branch) { 'prototype' }
-      let(:buildtag) { 'build-master-2013-10-01-01' }
+      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:tags) { [buildtag] }
       before do
         expect(cli).to receive(:ask).and_return(good_branch)
         expect(cli).to receive(:yes?).and_return(true)
 
-        expect(cli).to receive(:current_build_tag).with(good_branch).and_return(buildtag)
-
+        expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'build-master-2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/master/2013-10-01-01').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
 
@@ -69,14 +73,14 @@ describe Gitx::Cli::NukeCommand do
       end
     end
     context 'when user does not confirm nuking the target branch' do
-      let(:buildtag) { 'build-master-2013-10-01-01' }
+      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:tags) { [buildtag] }
       before do
         expect(cli).to receive(:ask).and_return('master')
         expect(cli).to receive(:yes?).and_return(false)
 
-        expect(cli).to receive(:current_build_tag).with('master').and_return(buildtag)
-
-        expect(executor).to_not receive(:execute)
+        expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
+        expect(executor).to_not receive(:execute).with('git', 'checkout', 'master').ordered
 
         cli.nuke 'prototype'
       end
@@ -95,13 +99,12 @@ describe Gitx::Cli::NukeCommand do
       let(:buildtags) { '' }
       it 'raises error' do
         expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
-        expect(executor).to receive(:execute).with('git', 'tag', '--list', 'build-master-*').and_return(buildtags).ordered
-
         expect { cli.nuke('prototype') }.to raise_error(/No known good tag found for branch/)
       end
     end
     context 'when database migrations exist and user cancels operation' do
-      let(:buildtag) { 'build-master-2013-10-01-01' }
+      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:tags) { [buildtag] }
       let(:good_branch) { 'master' }
       let(:bad_branch) { 'prototype' }
       let(:migrations) do
@@ -110,11 +113,10 @@ describe Gitx::Cli::NukeCommand do
       before do
         FileUtils.mkdir_p('db/migrate')
 
-        expect(cli).to receive(:current_build_tag).with(good_branch).and_return(buildtag)
-
+        expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
         expect(cli).to receive(:ask).and_return(good_branch)
-        expect(cli).to receive(:yes?).with('Reset prototype to build-master-2013-10-01-01? (y/n)', :green).and_return(true)
-        expect(executor).to receive(:execute).with('git', 'diff', 'build-master-2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
+        expect(cli).to receive(:yes?).with('Reset prototype to builds/master/2013-10-01-01? (y/n)', :green).and_return(true)
+        expect(executor).to receive(:execute).with('git', 'diff', 'builds/master/2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
         expect(cli).to receive(:yes?).with('Are you sure you want to nuke prototype? (y/n) ', :green).and_return(false)
 
         cli.nuke 'prototype'
@@ -127,7 +129,8 @@ describe Gitx::Cli::NukeCommand do
       end
     end
     context 'when database migrations exist and user approves operation' do
-      let(:buildtag) { 'build-master-2013-10-01-01' }
+      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:tags) { [buildtag] }
       let(:good_branch) { 'master' }
       let(:bad_branch) { 'prototype' }
       let(:migrations) do
@@ -136,17 +139,16 @@ describe Gitx::Cli::NukeCommand do
       before do
         FileUtils.mkdir_p('db/migrate')
 
-        expect(cli).to receive(:current_build_tag).with(good_branch).and_return(buildtag)
-
         expect(cli).to receive(:ask).and_return(good_branch)
-        expect(cli).to receive(:yes?).with('Reset prototype to build-master-2013-10-01-01? (y/n)', :green).and_return(true)
-        expect(executor).to receive(:execute).with('git', 'diff', 'build-master-2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
+        expect(cli).to receive(:yes?).with('Reset prototype to builds/master/2013-10-01-01? (y/n)', :green).and_return(true)
+        expect(executor).to receive(:execute).with('git', 'diff', 'builds/master/2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
         expect(cli).to receive(:yes?).with('Are you sure you want to nuke prototype? (y/n) ', :green).and_return(true)
 
+        expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'build-master-2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/master/2013-10-01-01').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
 

metadata

@@ -1,237 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.23.2
+  version: 3.0.0.ci.188.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: rake
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   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: webmock
   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: timecop
   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: vcr
   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: guard
   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: guard-rspec
   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: coveralls
   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: terminal-notifier
   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: terminal-notifier-guard
   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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Git eXtensions for improved development workflows
@@ -251,13 +251,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitx.yml"
-- ".hound.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .gitx.yml
+- .hound.yml
+- .rspec
+- .rubocop.yml
+- .ruby-version
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -328,17 +328,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations
@@ -367,4 +367,3 @@ test_files:
 - spec/support/timecop.rb
 - spec/support/vcr.rb
 - spec/support/webmock.rb
-has_rdoc: