version-manager 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a027681c507a0b6a58e3014d2979b264b44c7c53
-  data.tar.gz: 30711ab85541113e7b250818a9c71471cfb435eb
+  metadata.gz: 9c8b3d22e9596018b567dd472b59fa1403ce49bc
+  data.tar.gz: f2c07628d82f8c67c0da20d3b28c544c9a6c8dd2
 SHA512:
-  metadata.gz: 801e931e81c98fd45f6c5f0c333cb2ea8b6bd1a33967e546b1fd988b978cf2750a136e87883a251a6d8ae59beb93b83fd9fb4ec260d53656221698f1356184a7
-  data.tar.gz: 0a489a98f4af549d9c7d9fdd009ce3531c5b0e85d0e42cd26c59f84311462f8956d5062c27ac23c5a73788dcae93cb080ea263d9280c332adecc986cf5ca3ec7
+  metadata.gz: daaf1b6beb27e15b7ebe3b591d743ae4c7bfc46ebf44e858ae7a66d430120851f9ccebaccc697ace4a2f90873bc30e461fe2c8d363aebe24872fe0b532f54349
+  data.tar.gz: 2cc0e45bdca3993a12fd397da1e84c4716f88b460364da8c57e30d4114c78ecc6bde71e22d1fda1cbb1c00ff86aba7d75474366d4ecb177f00769eb6bc87b78a

data/lib/version-manager/cli.rb

@@ -49,10 +49,10 @@ module VersionManager
 
     def make_release(release_type)
       storage = build_storage
-      version = storage.latest_version
+      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? [Y/n]", default: false)
+      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.new(version, VCS.build, storage).public_send("#{release_type}!")

data/lib/version-manager/version.rb

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

data/lib/version-manager/version_storage.rb

@@ -21,20 +21,33 @@ module VersionManager
     end
 
     def latest_version
-      versions = vcs.remote_branch_names.map do |name|
-        name = name.split('/').last
-        ReleaseVersion.new(name) if name.include?('release-') && ReleaseVersion.valid?(name)
-      end
-      version = select_appropriate_version(versions)
-      file_content = vcs.show_file(version.branch, relative_path) if version
-      version = ReleaseVersion.new(file_content) if file_content && ReleaseVersion.valid?(file_content)
-      version
+      versions = vcs.remote_branch_names.map(&method(:version_from_branch_name))
+      version = select_appropriate_version(versions) # It's a partial release version (only major and minor parts)
+      version_from_file(version)
+    end
+
+    def current_version
+      version = version_from_branch_name(vcs.current_branch)
+      raise ArgumentError, 'Can not detect a current version' unless version
+      version_from_file(version)
     end
 
     private
 
     attr_reader :filename, :filepath, :vcs
 
+    def version_from_file(version)
+      return unless version
+      file_content = vcs.show_file(version.branch, relative_path) if version
+      ReleaseVersion.new(file_content) if file_content && ReleaseVersion.valid?(file_content)
+    end
+
+    def version_from_branch_name(branch_name)
+      return unless branch_name
+      branch_name = branch_name.split('/').last
+      ReleaseVersion.new(branch_name) if branch_name.include?('release-') && ReleaseVersion.valid?(branch_name)
+    end
+
     def relative_path
       Pathname.new(full_path).relative_path_from(Pathname.new(ROOT_DIR)).to_s
     end

metadata

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