gitx 3.0.1 → 3.0.2.ci.207.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e57f110c566aac26bc0949951a56fe84194c8a1
-  data.tar.gz: 95a8677eea27e97a4dc05c838fac160d2917ba4c
+  metadata.gz: 8ed35ddb21db73e7fe696acf0f68f6cbe1d5fec1
+  data.tar.gz: bc7c18139c9c1b903fe1c1af830ff9f9295733a3
 SHA512:
-  metadata.gz: 1f755e72690766f1e809f0e308bfbf436a70295931b3922d85c57949dd72d7774293b1a22cd724df621b4e2cac7a37476306a55435bea331c7a43e56492ff6d1
-  data.tar.gz: 048436b3042c7097a4f383ef2271245a939dd7a3b2ddcc49bba72d52bf6e077426f8b9b161a8b09d4fa336a44cefcf2383c66b23ebd55bb7fca978bea8d0dbeb
+  metadata.gz: 309704595ce9c974389f33643cd3617f31ff4a48283eb031c99a3aed27902d1b411a39232d3dd305b6674fbcdfa5fe44cfffc1a197f6e1ad580d57c81aa599ac
+  data.tar.gz: adebec824546f017340e76b5858f52518dcf0a6d3c283a7bfca2363df8302e59ea4fda073d59c081244f94ef2281a7809e25175aa4c0808af3a1e9a823c8b539

data/.rubocop.yml

@@ -49,4 +49,6 @@ Style/FrozenStringLiteralComment:
 
 # increase max block size (fixes gemspec validation)
 Metrics/BlockLength:
-  Max: 50
+  Exclude:
+    - gitx.gemspec
+    - spec/**/*

data/gitx.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitx/version'
@@ -18,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rugged', '~> 0.24.0'
+  spec.add_runtime_dependency 'rugged', '~> 0.26.0'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'octokit'
 

data/lib/gitx/cli/start_command.rb

@@ -5,7 +5,7 @@ require 'gitx/cli/base_command'
 module Gitx
   module Cli
     class StartCommand < BaseCommand
-      EXAMPLE_BRANCH_NAMES = %w(api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link).freeze
+      EXAMPLE_BRANCH_NAMES = %w[api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link].freeze
       VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/
 
       desc 'start', 'start a new git branch with latest changes from master'

data/lib/gitx/extensions/thor.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 class Thor
   module Actions
     # launch configured editor to retreive message/string
@@ -7,7 +9,7 @@ class Thor
     def ask_editor(initial_text = '', editor: nil, footer: nil)
       editor ||= ENV['EDITOR'] || 'vi'
       initial_text += "\n\n#{footer}" if footer
-      text = Tempfile.open('text.md') do |f|
+      text = ::Tempfile.open('text.md') do |f|
         f << initial_text
         f.flush
 

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.2'.freeze
 end

data/spec/gitx/cli/base_command_spec.rb

@@ -24,9 +24,9 @@ describe Gitx::Cli::BaseCommand do
   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)
+        'aggregate_branches' => %w[foo bar],
+        'reserved_branches' => %w[baz qux],
+        'taggable_branches' => %w[quux corge]
       }
     end
     before do
@@ -36,9 +36,9 @@ describe Gitx::Cli::BaseCommand do
       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))
+      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

data/spec/gitx/cli/integrate_command_spec.rb

@@ -159,7 +159,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Integrate feature-branch into staging\n\nConnected to #10", 'feature-branch')
-          .and_raise('git merge feature-branch failed').ordered
+                                             .and_raise('git merge feature-branch failed').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           expect { cli.integrate }.to raise_error(/Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)

data/spec/gitx/cli/nuke_command_spec.rb

@@ -108,7 +108,7 @@ describe Gitx::Cli::NukeCommand do
       let(:good_branch) { 'master' }
       let(:bad_branch) { 'prototype' }
       let(:migrations) do
-        %w(db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb).join("\n")
+        %w[db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb].join("\n")
       end
       before do
         FileUtils.mkdir_p('db/migrate')
@@ -134,7 +134,7 @@ describe Gitx::Cli::NukeCommand do
       let(:good_branch) { 'master' }
       let(:bad_branch) { 'prototype' }
       let(:migrations) do
-        %w(db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb).join("\n")
+        %w[db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb].join("\n")
       end
       before do
         FileUtils.mkdir_p('db/migrate')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2.ci.207.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -277,12 +277,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.6.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations