project_releaser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e42b85241d5de5de7ceb62b2dfcba7f47c5734c6
-  data.tar.gz: 621ccb9a1cda741091c825cb8ab17cb2f436384b
+  metadata.gz: 570f8882f32c4f4795dd4c3f164aa04542a88c24
+  data.tar.gz: ff08a4263a84f11a8762a08e390da0306c6d846e
 SHA512:
-  metadata.gz: ea7db764109f0ee52c8a228e7e34d3b5ba3d167b36a8aa214cd98a4c5f8e2fd533d0d759a950fdea09b0d1514d25107605d7d267d240c37f50e32a248fbbfda0
-  data.tar.gz: f4515caf266dc56251ae036fe798c4efd72497e0b86ce02e57a82915f4f6a6b3d46d21c9c6d652688c07f8edf09036b62d0307e0eb8c82540a4c5ce8a077f5d4
+  metadata.gz: 262e53a6e70074bb22b19d18c089e604f36da1f10e8ca0e91401ff2b3ed44cbcabe50ac9d9f45f300c44a9416d450c234e36a2c84e6796e4f572566b579dc064
+  data.tar.gz: 4c6a50ac1124b8b245b5c8e53494d68edbe85d6f83e0f61ae327955145309f5175243fcccbe84556e78d0977dd61db78f35ce9ea345ee7d5ec9db210fe155fbe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    project_releaser (0.0.3)
+    project_releaser (0.0.5)
       colorize
       commander
       git
@@ -10,12 +10,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.0)
-    colorize (0.7.7)
-    commander (4.3.4)
+    colorize (0.8.1)
+    commander (4.4.0)
       highline (~> 1.7.2)
     diff-lcs (1.2.5)
-    git (1.2.9.1)
-    highline (1.7.2)
+    git (1.3.0)
+    highline (1.7.8)
     method_source (0.8.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -48,4 +48,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.12.1
+   1.12.5

data/lib/project_releaser/project/releaser.rb

@@ -26,11 +26,13 @@ module ProjectReleaser
       def merge_branches
         logger.info "merging 'develop' into 'master'"
         @git.merge :master, :develop
+        logger.info "merging back 'master' into 'develop'"
+        @git.merge :develop, :master
       end
 
       def push_release(version)
         logger.info "pushing new release `#{version}` to 'master'"
-        @git.push :master, version 
+        @git.push :master, version
       end
 
       def branches

data/lib/project_releaser/project/repository.rb

@@ -56,7 +56,7 @@ module ProjectReleaser
       end
 
       def checkout(branch)
-        @git.checkout branch 
+        @git.checkout branch
       rescue Git::GitExecuteError
         raise MissingBranch, "Branch '#{branch}' is missing"
       end

data/lib/project_releaser/version.rb

@@ -1,3 +1,3 @@
 module ProjectReleaser
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
 end

data/spec/project_releaser/project/info_spec.rb

@@ -2,15 +2,14 @@ require 'spec_helper'
 require 'json'
 
 describe ProjectReleaser::Project::Info do
-
   let(:repository) { double 'git' }
   let(:subject) { ProjectReleaser::Project::Info.new repository }
 
   describe '#name' do
     it 'gets name from last remote url' do
       remotes = {
-        :origin => 'git@git.example.com/hello.git',
-        :upstream => 'git@git.example.com/goodbye.git'
+        origin: 'git@git.example.com/hello.git',
+        upstream: 'git@git.example.com/goodbye.git'
       }
       allow(repository).to receive(:remotes).and_return(remotes)
 
@@ -27,10 +26,10 @@ describe ProjectReleaser::Project::Info do
 
   describe '#current_version' do
     it 'fetches remotes and returns current version' do
-      allow(repository).to receive(:current_version).and_return({ :major => 2, :minor => 3, :patch => 3 })
+      allow(repository).to receive(:current_version).and_return(major: 2, minor: 3, patch: 3)
 
       allow(repository).to receive(:fetch_tags) do
-        allow(repository).to receive(:current_version).and_return({ :major => 2, :minor => 3, :patch => 4 })
+        allow(repository).to receive(:current_version).and_return(major: 2, minor: 3, patch: 4)
       end
 
       expect(subject.current_version).to eq 'v2.3.4'
@@ -38,9 +37,8 @@ describe ProjectReleaser::Project::Info do
   end
 
   describe '#next_version' do
-
     before :each do
-      allow(repository).to receive(:current_version).and_return({ :major => 2, :minor => 3, :patch => 4 })
+      allow(repository).to receive(:current_version).and_return(major: 2, minor: 3, patch: 4)
     end
 
     it 'returns next patch version' do
@@ -63,20 +61,21 @@ describe ProjectReleaser::Project::Info do
       expect(subject.next_version nil).to eq 'v2.3.5'
     end
 
-    it 'accepts version type as string' do 
+    it 'accepts version type as string' do
       expect(subject.next_version 'major').to eq 'v3.0.0'
     end
 
     it 'returns version_type if it is exact version number' do
-      expect(subject.next_version 'v7.10.5').to eq 'v7.10.5' 
+      expect(subject.next_version 'v7.10.5').to eq 'v7.10.5'
     end
 
     it 'returns version_type prefixed with v if it is exact version number' do
-      expect(subject.next_version '7.10.5').to eq 'v7.10.5' 
+      expect(subject.next_version '7.10.5').to eq 'v7.10.5'
     end
 
     it 'raises error when version is invalid' do
-      expect{subject.next_version 'death star'}.to raise_error
+      expect { subject.next_version 'death star' }.to raise_error(ArgumentError)
     end
   end
 end
+

data/spec/project_releaser/project/releaser_spec.rb

@@ -13,12 +13,13 @@ describe ProjectReleaser::Project::Releaser do
     allow(yielded_repository).to receive(:has_branch?).with(:develop).and_return(true)
     expect(yielded_repository).to receive(:pull).with([:master, :develop]).ordered
     expect(yielded_repository).to receive(:merge).with(:master, :develop).ordered
+    expect(yielded_repository).to receive(:merge).with(:develop, :master).ordered
     expect(yielded_repository).to receive(:push).with(:master, 'v2.3.5').ordered
 
     subject.release 'v2.3.5'
   end
 
-  it 'doesnt pull and skips merging when there is no staging branch' do
+  it 'doesnt pull and skips merging when there is no develop branch' do
     allow(yielded_repository).to receive(:has_branch?).with(:develop).and_return(false)
     expect(yielded_repository).to receive(:pull).with([:master]).ordered
     expect(yielded_repository).not_to receive(:merge)

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: project_releaser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kagux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '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: git
   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: commander
   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: colorize
   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'
 description: Manage project release routines
@@ -116,10 +116,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -161,17 +161,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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Make project release painless