version-manager 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8b3d22e9596018b567dd472b59fa1403ce49bc
-  data.tar.gz: f2c07628d82f8c67c0da20d3b28c544c9a6c8dd2
+  metadata.gz: 6d559cf3375b9da3ddd916c4fc9e95f7337d0b28
+  data.tar.gz: 818ec77ac1bf956b2249c2a887c0b36b316f510d
 SHA512:
-  metadata.gz: daaf1b6beb27e15b7ebe3b591d743ae4c7bfc46ebf44e858ae7a66d430120851f9ccebaccc697ace4a2f90873bc30e461fe2c8d363aebe24872fe0b532f54349
-  data.tar.gz: 2cc0e45bdca3993a12fd397da1e84c4716f88b460364da8c57e30d4114c78ecc6bde71e22d1fda1cbb1c00ff86aba7d75474366d4ecb177f00769eb6bc87b78a
+  metadata.gz: b318adf3f2c519388297683f17abc7c98116a41bdebf759307c099ff9fdfd0ab0fcd39c67a5d8d1ae08d8dbc4c95eafd673494084423d7dcef35842b12e279e6
+  data.tar.gz: 2f026727ac553beca5dd328b895ff9ee45e9584fe8265c5c53564d27c08dc72b71798365a96ee2ddfdfc08f652e4d73bb33413ec4788a1dad9ea7980be94bc55

data/lib/version-manager/cli.rb

@@ -49,13 +49,19 @@ module VersionManager
 
     def make_release(release_type)
       storage = build_storage
-      version = release_type == :patch ? storage.current_version : storage.latest_version
 
-      new_version = version.public_send("bump_#{release_type}")
-      return if version && !Ask.confirm("You are going to upgrade version to #{new_version}. Do it?", default: false)
-      version = retrieve_initial_version unless version
+      make = Make.new(VCS.build, storage)
+      make.validate!(release_type)
+
+      version = release_type == :patch ? storage.current_version : storage.latest_version
+      if version
+        new_version = version.public_send("bump_#{release_type}")
+        return unless Ask.confirm("You are going to upgrade version to #{new_version}. Do it?", default: false)
+      else
+        version = retrieve_initial_version
+      end
 
-      Make.new(version, VCS.build, storage).public_send("#{release_type}!")
+      make.public_send("#{release_type}!", version)
     rescue VersionManager::VersionStorage::WrongLatestVersionError => e
       puts "There is inappropriate version #{e.version} in your local/remote repository. Please remove it"
     end

data/lib/version-manager/make.rb

@@ -12,45 +12,42 @@ module VersionManager
       end
     end
 
-    def initialize(version, vcs, version_storage)
-      @version = version
+    def initialize(vcs, version_storage)
       @vcs = vcs
       @version_storage = version_storage
     end
 
-    def major!
+    def validate!(release_type)
       raise BranchIsNotUpToDateError unless vcs.master_state_actual?
-      raise ForbiddenBranchError unless appropriate_branch_for?('major')
-      default_strategy { version.bump_major }
+      raise ForbiddenBranchError unless appropriate_branch_for?(release_type)
     end
 
-    def minor!
-      raise BranchIsNotUpToDateError unless vcs.master_state_actual?
-      raise ForbiddenBranchError unless appropriate_branch_for?('minor')
-      default_strategy { version.bump_minor }
+    def major!(version)
+      default_strategy(version.bump_major)
     end
 
-    def patch!
-      raise BranchIsNotUpToDateError unless vcs.state_actual?
-      raise ForbiddenBranchError unless appropriate_branch_for?('patch')
-      @version = version.bump_patch
-      vcs.commit(version_storage.store(version), default_commit_message)
-      vcs.add_tag(version.to_s, default_commit_message)
+    def minor!(version)
+      default_strategy(version.bump_minor)
+    end
+
+    def patch!(version)
+      version = version.bump_patch
+      vcs.commit(version_storage.store(version), default_commit_message(version))
+      vcs.add_tag(version.to_s, default_commit_message(version))
       vcs.push_tag(version.to_s)
       vcs.push
     end
 
     private
 
-    attr_reader :version, :vcs, :version_storage
+    attr_reader :vcs, :version_storage
 
     def appropriate_branch_for?(action)
       authorized_mask = VersionManager.options[:authorized_branches][action.to_sym]
       !authorized_mask || !vcs.current_branch.match(authorized_mask).nil?
     end
 
-    def default_strategy
-      @version = yield
+    def default_strategy(version)
       vcs.create_branch!(version.branch)
       vcs.commit(version_storage.store(version), default_commit_message)
       vcs.add_tag(version.to_s, default_commit_message)
@@ -58,7 +55,7 @@ module VersionManager
       vcs.push
     end
 
-    def default_commit_message
+    def default_commit_message(version)
       message = VersionManager.options[:vcs][:default_commit_message]
       message.respond_to?(:call) ? message.call(version) : message.to_s
     end

data/lib/version-manager/vcs/git.rb

@@ -20,7 +20,7 @@ module VersionManager
       end
 
       def show_file(branch, filepath)
-        git.object("#{branch}:#{filepath}").contents
+        git.object("#{remote}/#{branch}:#{filepath}").contents
       rescue StandardError
         nil
       end

data/lib/version-manager/version.rb

@@ -1,3 +1,3 @@
 module VersionManager
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: version-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - isolo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler