version-manager 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72195cbb7ffb69504dab8393c3b7713cf4f173b9
-  data.tar.gz: 3e9b007594d46581a634e4b14b5ef782b1fbe4e7
+  metadata.gz: eb8ca0a693505ca6d8683707210fb91d1ee4de14
+  data.tar.gz: 65aba765dfb701b27f0ca76295dcc85139647019
 SHA512:
-  metadata.gz: 803379762fe18a68559d8ef860d104023112fc982652b7045d52e47cdc1f2f191be27a6fded89c494ca1b3ab6597c9fd17389f31f54c480d80250b225471a285
-  data.tar.gz: 1c3a3864efc1cc6d1e7ce2c8d2d959cd9b0463e2275ce67cf5b62259eb44bdb96eceed36da31f573249b6b6aecd3f2839a02a871b48210c21ff93da6c5e41928
+  metadata.gz: ff3cbeb177bcc900da57fb05ea24c8c848691542f672f054d0ebf91364a884c567db021531e42940072b82dd1fe7e6314edce6129289d0b2ec4b6fa244427bda
+  data.tar.gz: 678bd6b32fcddec75f4ce89ead9fc5530dad52d9e43a9916fa82566310c59cd92f5a42d8a98af72f3f9cb45101b79c20b13c6435854030f3ab45935c5ffd5c8b

data/README.md

@@ -1,2 +1,22 @@
 # version-manager
 versioning lib (with Git support) written in Ruby
+
+## Information:
+The gem purpose is to automate process of releasing a new version. It can be used with [semver](http://semver.org/).
+There are three version components: major, minor and patch (MAJOR.MINOR.PATCH).
+Major and minor versions should be updated from the master branch. Patch version should be updated from the release branch.
+By default, release version has a format like: release-MAJOR.MINOR.
+Also, a tag is being created alongside with a branch. It has a format like: MAJOR.MINOR.PATCH.
+
+## Installation:
+    gem install version-manager
+
+## Usage:
+
+### Bump a new version:
+    manver make major
+    manver make minor
+    manver make patch
+
+### Switch to the latest version:
+    manver latest

data/lib/version-manager.rb

@@ -2,6 +2,7 @@ require 'docopt'
 require 'git'
 require 'pathname'
 require 'logger'
+require 'inquirer'
 
 ROOT_DIR = Dir.pwd
 
@@ -12,8 +13,7 @@ module VersionManager
       default_commit_message: -> (version) { "Bumped to version #{version}" },
       options: {
         remote: 'origin',
-        master_branch: 'master',
-        log: Logger.new(STDOUT)
+        master_branch: 'master'
       }
     },
     authorized_branches: {

data/lib/version-manager/cli.rb

@@ -44,14 +44,20 @@ module VersionManager
       storage = build_storage
       version = storage.latest_version
       return puts 'There are no any versions.' unless version
-      VCS.build.checkout(version.branch)
+      VCS.build.switch_branch(version.branch)
     end
 
     def make_release(release_type)
       storage = build_storage
       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)
       version = retrieve_initial_version unless version
+
       Make.new(version, VCS.build, storage).public_send("#{release_type}!")
+    rescue VersionManager::VersionStorage::WrongLatestVersionError => e
+      puts "There is inappropriate version #{e.version} in your local/remote repository. Please remove it"
     end
 
     def build_storage

data/lib/version-manager/make.rb

@@ -21,19 +21,19 @@ module VersionManager
     def major!
       raise BranchIsNotUpToDateError unless vcs.master_state_actual?
       raise ForbiddenBranchError unless appropriate_branch_for?('major')
-      default_strategy { |version| version.bump_major }
+      default_strategy { version.bump_major }
     end
 
     def minor!
       raise BranchIsNotUpToDateError unless vcs.master_state_actual?
       raise ForbiddenBranchError unless appropriate_branch_for?('minor')
-      default_strategy { |version| version.bump_minor }
+      default_strategy { version.bump_minor }
     end
 
     def patch!
       raise BranchIsNotUpToDateError unless vcs.state_actual?
       raise ForbiddenBranchError unless appropriate_branch_for?('patch')
-      version.bump_patch
+      version = version.bump_patch
       vcs.commit(version_storage.store(version), default_commit_message)
       vcs.add_tag(version.to_s, default_commit_message)
       vcs.push_tag(version.to_s)
@@ -50,7 +50,7 @@ module VersionManager
     end
 
     def default_strategy
-      yield version
+      @version = yield
       vcs.create_branch!(version.branch)
       vcs.commit(version_storage.store(version), default_commit_message)
       vcs.add_tag(version.to_s, default_commit_message)

data/lib/version-manager/release_version.rb

@@ -8,10 +8,10 @@ module VersionManager
       end
     end
 
-    def initialize(version_input)
-      version_components = version_input.dup
-      unless version_input.respond_to?(:to_ary)
-        version_components = version_input.scan(/(\d+)\.{1}(\d+)\.?(\d*)(?:--(\w+))?/).flatten
+    def initialize(*version_input)
+      version_components = Array(version_input.dup.flatten)
+      if version_components.size == 1
+        version_components = version_components.first.scan(/(\d+)\.{1}(\d+)\.?(\d*)(?:--(\w+))?/).flatten
         raise ArgumentError, 'Incorrect version format' if version_components.all?(&:nil?) || version_components.empty?
       end
       @major, @minor, @patch = version_components[0..2].map(&:to_i)
@@ -39,22 +39,20 @@ module VersionManager
         find { |res| res != 0 } || 0
     end
 
+    def -(other_version)
+      self.class.new(parts.zip(other_version.parts).map { |x, y| x - y })
+    end
+
     def bump_major
-      @major += 1
-      @minor = 0
-      @patch = 0
-      recalculate_parts
+      self.class.new(@major + 1, 0, 0)
     end
 
     def bump_minor
-      @minor += 1
-      @patch = 0
-      recalculate_parts
+      self.class.new(@major, @minor + 1, 0)
     end
 
     def bump_patch
-      @patch += 1
-      recalculate_parts
+      self.class.new(@major, @minor, @patch + 1)
     end
 
     def self.valid?(version)
@@ -69,6 +67,7 @@ module VersionManager
 
     def recalculate_parts
       @parts = [major, minor, patch].map(&:to_i)
+      self
     end
   end
 end

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

@@ -15,6 +15,10 @@ module VersionManager
         git.branch(branch_name).checkout
       end
 
+      def switch_branch(branch_name) # checkout moves commits to new branch
+        git.lib.send(:command, 'checkout', branch_name)
+      end
+
       def show_file(branch, filepath)
         git.object("#{branch}:#{filepath}").contents
       rescue StandardError

data/lib/version-manager/version.rb

@@ -1,3 +1,3 @@
 module VersionManager
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/lib/version-manager/version_storage.rb

@@ -1,5 +1,12 @@
 module VersionManager
   class VersionStorage
+    class WrongLatestVersionError < StandardError
+      attr_reader :version
+      def initialize(version)
+        @version = version
+      end
+    end
+
     def initialize(vcs, storage_options)
       @filename = storage_options[:filename]
       @filepath = storage_options[:filepath]
@@ -18,7 +25,7 @@ module VersionManager
         name = name.split('/').last
         ReleaseVersion.new(name) if name.include?('release-') && ReleaseVersion.valid?(name)
       end
-      version = versions.compact.sort.last
+      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
@@ -35,5 +42,17 @@ module VersionManager
     def full_path
       File.expand_path(File.join(filepath, filename))
     end
+
+    def select_appropriate_version(versions)
+      sorted_versions = versions.compact.sort
+      prev_last_version, last_version = sorted_versions.last(2)
+      return prev_last_version unless last_version
+      diff = last_version - prev_last_version
+      is_appropriate = diff.major == 1
+      is_appropriate ||= diff.major == 0 && diff.minor == 1
+      is_appropriate ||= diff.major == 0 && diff.minor == 0 && diff.patch == 1
+      raise WrongLatestVersionError.new(last_version) unless is_appropriate
+      last_version
+    end
   end
 end

data/version-manager.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_dependency 'docopt', '~> 0.5'
+  spec.add_dependency 'inquirer', '~> 0.2'
   spec.add_dependency 'git', '~> 1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: version-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - isolo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: inquirer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement