project_releaser 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570f8882f32c4f4795dd4c3f164aa04542a88c24
-  data.tar.gz: ff08a4263a84f11a8762a08e390da0306c6d846e
+  metadata.gz: c1cd379709acc477b4a850bf86d807f573a468a9
+  data.tar.gz: 3bca27c5d820261d5b09715e71b6ceb0c423495a
 SHA512:
-  metadata.gz: 262e53a6e70074bb22b19d18c089e604f36da1f10e8ca0e91401ff2b3ed44cbcabe50ac9d9f45f300c44a9416d450c234e36a2c84e6796e4f572566b579dc064
-  data.tar.gz: 4c6a50ac1124b8b245b5c8e53494d68edbe85d6f83e0f61ae327955145309f5175243fcccbe84556e78d0977dd61db78f35ce9ea345ee7d5ec9db210fe155fbe
+  metadata.gz: 90299be31807c6dc33bb8607b146338af3ca5c7f368325c9a5942e944727ec98d4f00f28d534345b31f5a8ef70498c5a777cb538285d1555b4560d57b69e5902
+  data.tar.gz: 15424416eeb4b5d798abeba31036bf14f5f425bc451a939c0715ff01f323937d99e7638f2e0f388557da86be3757e5d2c1f1744da43ba98085d289c0a31d66b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    project_releaser (0.0.5)
+    project_releaser (0.0.6)
       colorize
       commander
       git
@@ -9,32 +9,32 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.0)
+    coderay (1.1.1)
     colorize (0.8.1)
-    commander (4.4.0)
+    commander (4.4.3)
       highline (~> 1.7.2)
     diff-lcs (1.2.5)
     git (1.3.0)
     highline (1.7.8)
     method_source (0.8.2)
-    pry (0.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     slop (3.6.0)
 
 PLATFORMS

data/lib/project_releaser.rb

@@ -20,6 +20,6 @@ module ProjectReleaser
   end
 
   def configuration
-    @configuration ||= OpenStruct.new 
+    @configuration ||= OpenStruct.new
   end
-end 
+end

data/lib/project_releaser/cli.rb

@@ -34,7 +34,7 @@ module ProjectReleaser
       command :version do |c|
         c.syntax = 'project version'
         c.description = 'Current version of the project'
-        action c do 
+        action c do
           logger.info "Current version of '#{project.name}' is #{project.current_version}"
         end
       end
@@ -44,7 +44,7 @@ module ProjectReleaser
       command :name do |c|
         c.syntax = 'project name'
         c.description = 'Infer project name from git remotes'
-        action c do 
+        action c do
           logger.info "You are working on project '#{project.name}'"
         end
       end
@@ -54,7 +54,7 @@ module ProjectReleaser
       command :update do |c|
         c.syntax = 'project update'
         c.description = 'Updates release and develop branches from all remotes'
-        action c do 
+        action c do
           ProjectReleaser::Project.update
         end
       end
@@ -64,7 +64,7 @@ module ProjectReleaser
       command :release do |c|
         c.syntax = 'project release'
         c.description = 'Merges develop into release and pushes it with new version tag'
-        action c do |args, options|
+        action c do |args, _options|
           ProjectReleaser::Project.release args.first
         end
       end
@@ -74,9 +74,9 @@ module ProjectReleaser
       ProjectReleaser::Project
     end
 
-    def action(cmd, &block)
+    def action(cmd)
       proc = lambda do |args, options|
-        block.call args, options
+        yield args, options
         logger.info '`Done!`'
       end
       cmd.action(&proc)

data/lib/project_releaser/project.rb

@@ -27,7 +27,8 @@ module ProjectReleaser
       info.next_version version_type
     end
 
-    private 
+    private
+
     def info
       Info.new(git)
     end

data/lib/project_releaser/project/info.rb

@@ -19,7 +19,7 @@ module ProjectReleaser
       end
 
       def next_version(version_type = :patch)
-        version_type = (version_type ||= :patch).to_sym
+        version_type = (version_type || :patch).to_sym
         return exact_version(version_type) unless valid_version_part? version_type
 
         new_version = @git.current_version
@@ -29,12 +29,10 @@ module ProjectReleaser
       end
 
       private
+
       def exact_version(version)
-        if version =~ /\Av{0,1}\d+\.\d+\.\d+\Z/
-          return version.to_s.prepend('v').sub('vv', 'v')
-        else
-          raise ArgumentError
-        end
+        raise ArgumentError unless version =~ /\Av{0,1}\d+\.\d+\.\d+\Z/
+        version.to_s.prepend('v').sub('vv', 'v')
       end
 
       def valid_version_part?(version)
@@ -48,7 +46,7 @@ module ProjectReleaser
       def reset_lesser_versions(full_version, cutoff_version)
         keys = full_version.keys
         index = keys.index cutoff_version
-        Hash[ full_version.map{|k, v| keys.index(k) <= index ? [k, v] : [k, 0]} ]
+        Hash[full_version.map { |k, v| keys.index(k) <= index ? [k, v] : [k, 0] }]
       end
     end
   end

data/lib/project_releaser/project/releaser.rb

@@ -19,7 +19,7 @@ module ProjectReleaser
       private
 
       def update_local_branches
-        logger.info "updating local branches"
+        logger.info 'updating local branches'
         @git.pull branches
       end
 
@@ -36,7 +36,7 @@ module ProjectReleaser
       end
 
       def branches
-        @branches ||=begin
+        @branches ||= begin
           branches = [:master]
           branches += [:develop] if @git.has_branch? :develop
           branches

data/lib/project_releaser/project/repository.rb

@@ -1,12 +1,12 @@
 module ProjectReleaser
   module Project
     class Repository
-      class RepositoryHasNoBranches < RuntimeError; end;
-      class RepositoryNotFound < RuntimeError; end;
-      class MissingBranch < RuntimeError; end;
+      class RepositoryHasNoBranches < RuntimeError; end
+      class RepositoryNotFound < RuntimeError; end
+      class MissingBranch < RuntimeError; end
 
-      VERSION_PARTS = %I(major minor patch)
-      DEFAULT_VERSION = [1, 0, 0]
+      VERSION_PARTS = %I(major minor patch).freeze
+      DEFAULT_VERSION = [1, 0, 0].freeze
 
       def initialize(repo_path)
         @git = open_repository(repo_path)
@@ -20,7 +20,7 @@ module ProjectReleaser
         branches.each do |branch|
           checkout branch
           @git.remotes.each do |remote|
-            @git.fetch remote.name #otherwise it wouldnt get new tags...
+            @git.fetch remote.name # otherwise it wouldnt get new tags...
             @git.pull remote.name, branch
           end
         end
@@ -39,20 +39,18 @@ module ProjectReleaser
       def push(branch, version_name)
         checkout branch
         @git.add_tag version_name
-        @git.remotes.each do |r|
-          @git.push r.name, branch
-          @git.push r.name, version_name 
-        end
+        @git.push 'origin', branch
+        @git.push 'origin', version_name
       end
 
       def remotes
-        Hash[@git.remotes.map{ |r| [r.name, r.url] }]
+        Hash[@git.remotes.map { |r| [r.name, r.url] }]
       end
 
       def current_branch
         raise RepositoryHasNoBranches unless @git.branches.count > 0
 
-        @git.branches.find { |b| b.current }.name
+        @git.branches.find(&:current).name
       end
 
       def checkout(branch)
@@ -62,32 +60,32 @@ module ProjectReleaser
       end
 
       def fetch_tags
-        @git.remotes.each { |r| @git.fetch(r.name, :tags => true) }
+        @git.remotes.each { |r| @git.fetch(r.name, tags: true) }
       end
 
       def has_branch?(branch_name)
         @git.branches.map(&:name).include? branch_name.to_s
       end
 
-      def returning_to_current_branch(&block)
+      def returning_to_current_branch
         branch = current_branch
         yield self
         checkout branch
       end
 
-      private 
+      private
 
       def versions
         tags = @git.tags
         return [DEFAULT_VERSION] if tags.empty?
         valid_tags = tags
-                    .map(&:name)
-                    .select{ |n| n =~ /\Av?\d+(\.\d+){1,2}\z/ }
+        .map(&:name)
+        .select { |n| n =~ /\Av?\d+(\.\d+){1,2}\z/ }
 
         return [DEFAULT_VERSION] if valid_tags.empty?
         valid_tags
-          .map{ |n| n.sub('v', '').split('.').map(&:to_i) }
-          .map{ |a| a.fill(0, a.size..2) }
+          .map { |n| n.sub('v', '').split('.').map(&:to_i) }
+          .map { |a| a.fill(0, a.size..2) }
           .sort
       end
 
@@ -99,3 +97,4 @@ module ProjectReleaser
     end
   end
 end
+

data/lib/project_releaser/version.rb

@@ -1,3 +1,3 @@
 module ProjectReleaser
-    VERSION = "0.0.5"
+  VERSION = '0.0.6'.freeze
 end

data/spec/project_releaser/project/info_spec.rb

@@ -78,4 +78,3 @@ describe ProjectReleaser::Project::Info do
     end
   end
 end
-

data/spec/project_releaser/project/repository_spec.rb

@@ -7,7 +7,7 @@ describe ProjectReleaser::Project::Repository do
 
   it 'raises exception if directory has no git repository' do
     allow(Git).to receive(:open).with(dir).and_raise(ArgumentError)
-    expect{subject}.to raise_error ProjectReleaser::Project::Repository::RepositoryNotFound
+    expect { subject }.to raise_error ProjectReleaser::Project::Repository::RepositoryNotFound
   end
 
   context 'when dir has repository' do
@@ -15,72 +15,70 @@ describe ProjectReleaser::Project::Repository do
       allow(Git).to receive(:open).with(dir).and_return(git)
     end
 
-
     describe '#current_version' do
       it 'takes version from last tag' do
-        tag_1 = double 'tag', :name => 'v1.2.3'
-        tag_2 = double 'tag', :name => 'v1.2.4'
+        tag_1 = double 'tag', name: 'v1.2.3'
+        tag_2 = double 'tag', name: 'v1.2.4'
         allow(git).to receive(:tags).and_return([tag_1, tag_2])
-        expect(subject.current_version).to eq :major => 1, :minor => 2, :patch => 4
+        expect(subject.current_version).to eq major: 1, minor: 2, patch: 4
       end
 
       it 'supports version without v prefix' do
-        tag = double 'tag', :name => '1.2.8'
+        tag = double 'tag', name: '1.2.8'
         allow(git).to receive(:tags).and_return([tag])
-        expect(subject.current_version).to eq :major => 1, :minor => 2, :patch => 8
+        expect(subject.current_version).to eq major: 1, minor: 2, patch: 8
       end
 
       it 'recognizes partial versions' do
-        tag = double 'tag', :name => 'v1.2'
+        tag = double 'tag', name: 'v1.2'
         allow(git).to receive(:tags).and_return([tag])
-        expect(subject.current_version).to eq :major => 1, :minor => 2, :patch => 0
+        expect(subject.current_version).to eq major: 1, minor: 2, patch: 0
       end
 
       it 'sorts tags by patch version' do
-        tag_1 = double 'tag', :name => 'v1.2.10'
-        tag_2 = double 'tag', :name => 'v1.2.2'
+        tag_1 = double 'tag', name: 'v1.2.10'
+        tag_2 = double 'tag', name: 'v1.2.2'
         allow(git).to receive(:tags).and_return([tag_1, tag_2])
-        expect(subject.current_version).to eq :major => 1, :minor => 2, :patch => 10
+        expect(subject.current_version).to eq major: 1, minor: 2, patch: 10
       end
 
       it 'sorts tags by minor version' do
-        tag_1 = double 'tag', :name => 'v1.10.2'
-        tag_2 = double 'tag', :name => 'v1.2.2'
+        tag_1 = double 'tag', name: 'v1.10.2'
+        tag_2 = double 'tag', name: 'v1.2.2'
         allow(git).to receive(:tags).and_return([tag_1, tag_2])
-        expect(subject.current_version).to eq :major => 1, :minor => 10, :patch => 2
+        expect(subject.current_version).to eq major: 1, minor: 10, patch: 2
       end
 
       it 'sorts tags by patch version' do
-        tag_1 = double 'tag', :name => 'v0.2.2'
-        tag_2 = double 'tag', :name => 'v1.2.2'
+        tag_1 = double 'tag', name: 'v0.2.2'
+        tag_2 = double 'tag', name: 'v1.2.2'
         allow(git).to receive(:tags).and_return([tag_1, tag_2])
-        expect(subject.current_version).to eq :major => 1, :minor => 2, :patch => 2
+        expect(subject.current_version).to eq major: 1, minor: 2, patch: 2
       end
 
       it 'returns default version when there are none' do
         allow(git).to receive(:tags).and_return([])
-        expect(subject.current_version).to eq :major => 1, :minor => 0, :patch => 0
+        expect(subject.current_version).to eq major: 1, minor: 0, patch: 0
       end
 
       it 'returns default version when there are no valid tags' do
-        tag = double 'tag', :name => 'random tag'
+        tag = double 'tag', name: 'random tag'
         allow(git).to receive(:tags).and_return([tag])
-        expect(subject.current_version).to eq :major => 1, :minor => 0, :patch => 0
+        expect(subject.current_version).to eq major: 1, minor: 0, patch: 0
       end
 
       it 'ignores tags that do not match semantic versioning and returns default one' do
-        tag_1 = double 'tag', :name => 'g1.2.3'
-        tag_2 = double 'tag', :name => 'random string'
+        tag_1 = double 'tag', name: 'g1.2.3'
+        tag_2 = double 'tag', name: 'random string'
         allow(git).to receive(:tags).and_return([tag_1, tag_2])
-        expect(subject.current_version).to eq :major => 1, :minor => 0, :patch => 0
+        expect(subject.current_version).to eq major: 1, minor: 0, patch: 0
       end
     end
 
-
-    describe '#pull' do 
+    describe '#pull' do
       it 'updates provided branches from remote urls' do
-        remote_1 = double 'remote url', :name => 'remote_1'
-        remote_2 = double 'remote url', :name => 'remote_2'
+        remote_1 = double 'remote url', name: 'remote_1'
+        remote_2 = double 'remote url', name: 'remote_2'
 
         allow(git).to receive(:remotes).and_return([remote_1, remote_2])
 
@@ -100,7 +98,6 @@ describe ProjectReleaser::Project::Repository do
       end
     end
 
-
     describe '#merge' do
       it 'merges two branches' do
         expect(git).to receive(:checkout).with(:branch_1).ordered
@@ -119,16 +116,16 @@ describe ProjectReleaser::Project::Repository do
       end
     end
 
-
     describe '#push' do
-      it 'tags with provided version and pushes to all remotes urls' do
-        remote = double 'remote url', :name => 'some_origin'
-        allow(git).to receive(:remotes).and_return([remote])
+      it 'tags with provided version and pushes only to origin remote url' do
+        remote = double 'remote url', name: 'some_origin'
+        origin = double 'remote url', name: 'origin'
+        allow(git).to receive(:remotes).and_return([origin, remote])
 
         expect(git).to receive(:checkout).with(:branch).ordered
         expect(git).to receive(:add_tag).with('v1.0.0')
-        expect(git).to receive(:push).with('some_origin', :branch).ordered
-        expect(git).to receive(:push).with('some_origin', 'v1.0.0').ordered
+        expect(git).to receive(:push).with('origin', :branch).ordered
+        expect(git).to receive(:push).with('origin', 'v1.0.0').ordered
 
         subject.push :branch, 'v1.0.0'
       end
@@ -136,8 +133,8 @@ describe ProjectReleaser::Project::Repository do
 
     describe '#remotes' do
       it 'returns hash with remote names and urls' do
-        remote_1 = double 'remote url', :name => 'remote_1', :url => 'url_1'
-        remote_2 = double 'remote url', :name => 'remote_2', :url => 'url_2'
+        remote_1 = double 'remote url', name: 'remote_1', url: 'url_1'
+        remote_2 = double 'remote url', name: 'remote_2', url: 'url_2'
 
         allow(git).to receive(:remotes).and_return([remote_1, remote_2])
 
@@ -145,12 +142,11 @@ describe ProjectReleaser::Project::Repository do
       end
     end
 
-
     describe '#current_branch' do
       it 'returns current repository branch name' do
-        branch_1 = double 'git branch', :name => 'my_feature 1', :current => false
-        branch_2 = double 'git branch', :name => 'my_feature 2', :current => true
-        branch_3 = double 'git branch', :name => 'my_feature 3', :current => false
+        branch_1 = double 'git branch', name: 'my_feature 1', current: false
+        branch_2 = double 'git branch', name: 'my_feature 2', current: true
+        branch_3 = double 'git branch', name: 'my_feature 3', current: false
         allow(git).to receive(:branches).and_return([branch_1, branch_2, branch_3])
 
         expect(subject.current_branch).to eq 'my_feature 2'
@@ -159,7 +155,7 @@ describe ProjectReleaser::Project::Repository do
       it 'raises exception of repository has no branches' do
         allow(git).to receive(:branches).and_return([])
 
-        expect{subject.current_branch}.to raise_error ProjectReleaser::Project::Repository::RepositoryHasNoBranches
+        expect { subject.current_branch }.to raise_error ProjectReleaser::Project::Repository::RepositoryHasNoBranches
       end
     end
 
@@ -172,31 +168,31 @@ describe ProjectReleaser::Project::Repository do
 
       it 'raises exception if the branch is missing' do
         allow(git).to receive(:checkout).with(:branch).and_raise(Git::GitExecuteError)
-        expect{subject.checkout :branch}.to raise_error ProjectReleaser::Project::Repository::MissingBranch
+        expect { subject.checkout :branch }.to raise_error ProjectReleaser::Project::Repository::MissingBranch
       end
     end
 
     describe '#fetch_tags' do
       it 'fetches tags from all remotes' do
-        remote_1 = double 'remote url', :name => 'remote_1'
-        remote_2 = double 'remote url', :name => 'remote_2'
+        remote_1 = double 'remote url', name: 'remote_1'
+        remote_2 = double 'remote url', name: 'remote_2'
         allow(git).to receive(:remotes).and_return([remote_1, remote_2])
 
-        expect(git).to receive(:fetch).with('remote_1', :tags => true)
-        expect(git).to receive(:fetch).with('remote_2', :tags => true)
+        expect(git).to receive(:fetch).with('remote_1', tags: true)
+        expect(git).to receive(:fetch).with('remote_2', tags: true)
 
         subject.fetch_tags
       end
     end
 
     describe '#has_branch' do
-      let(:branch) {double 'git branch', :name => 'the_branch'}
+      let(:branch) { double 'git branch', name: 'the_branch' }
       before :each do
         allow(git).to receive(:branches).and_return([branch])
       end
 
       it 'returns true if branch exists' do
-        expect(subject.has_branch?(:the_branch)).to be_truthy 
+        expect(subject.has_branch?(:the_branch)).to be_truthy
       end
 
       it 'returns false if branch exists' do
@@ -206,8 +202,8 @@ describe ProjectReleaser::Project::Repository do
 
     describe '#returning_to_current_branch' do
       let(:git) { double('git').as_null_object }
-      let(:tmp_branch) { double 'git branch', :name => :tmp_branch, :current => false }
-      let(:current_branch) { double 'git branch', :name => :current_branch, :current => true }
+      let(:tmp_branch) { double 'git branch', name: :tmp_branch, current: false }
+      let(:current_branch) { double 'git branch', name: :current_branch, current: true }
 
       before :each do
         allow(Git).to receive(:open).with(dir).and_return(git)
@@ -222,7 +218,7 @@ describe ProjectReleaser::Project::Repository do
 
       it 'checks out current branch after yielding block' do
         subject.returning_to_current_branch do
-          #change current branch to something else
+          # change current branch to something else
           allow(current_branch).to receive(:current).and_return(false)
           allow(tmp_branch).to receive(:current).and_return(true)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: project_releaser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - kagux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler