vump 1.2.0 → 2.0.0.pre.alpha.1

data/lib/vump/modules/base_module.rb

@@ -0,0 +1,28 @@
+module Vump
+  class BaseModule
+    def initialize(base_path, options = {})
+      @base_path = base_path
+      @options = options
+    end
+
+    def relevant?
+      false
+    end
+
+    def to_stage
+      raise NotImplementedError, "Missing to_stage on #{name}"
+    end
+
+    def read
+      raise NotImplementedError, "Missing read on #{name}"
+    end
+
+    def name
+      self.class.name
+    end
+
+    def write(_version)
+      raise NotImplementedError, "Missing write on #{name}"
+    end
+  end
+end

data/lib/vump/modules/package_json.rb

@@ -0,0 +1,24 @@
+require 'vump/modules/base_file_module'
+
+module Vump
+  class PackageJson < BaseFileModule
+    def filename
+      'package.json'
+    end
+
+    def name
+      filename
+    end
+
+    def select(contents)
+      @parsed = JSON.parse(contents)
+      @parsed['version']
+    end
+
+    def compose(_contents, version)
+      json = @parsed.clone
+      json['version'] = version
+      JSON.pretty_generate(json) + "\n"
+    end
+  end
+end

data/lib/vump/modules/package_lock_json.rb

@@ -0,0 +1,9 @@
+require 'vump/modules/package_json'
+
+module Vump
+  class PackageLockJson < PackageJson
+    def filename
+      'package-lock.json'
+    end
+  end
+end

data/lib/vump/modules/sheep_a_changelog.rb

@@ -0,0 +1,29 @@
+require 'vump/modules/base_file_module'
+require 'sheep-a-changelog'
+
+module Vump
+  class SheepAChangelog < BaseFileModule
+    def filename
+      'CHANGELOG.md'
+    end
+
+    def name
+      'Changelog'
+    end
+
+    def select(contents)
+      doc = ::SheepAChangelog.parse(contents)
+      doc.latest_version(1)
+    end
+
+    def compose(contents, version)
+      doc = ::SheepAChangelog.parse(contents)
+      doc.release(
+        version,
+        @options[:tag_prefix] || 'v',
+        @options[:date] || Time.now
+      )
+      doc.to_s
+    end
+  end
+end

data/lib/vump/modules/version_file.rb

@@ -0,0 +1,21 @@
+require 'vump/modules/base_file_module'
+
+module Vump
+  class VersionFile < BaseFileModule
+    def filename
+      'VERSION'
+    end
+
+    def name
+      filename
+    end
+
+    def select(contents)
+      contents.strip
+    end
+
+    def compose(_contents, version)
+      "#{version}\n"
+    end
+  end
+end

data/lib/vump/semver/semver.rb

@@ -1,6 +1,7 @@
 module Vump
-  # Representation of version notation according to https://semver.org/
   class Semver
+    attr_accessor :major, :patch, :minor, :pre, :build
+
     def initialize(string = nil)
       @pre = @build = false
       @major = @minor = @patch = 0
@@ -10,15 +11,15 @@ module Vump
     def load(string)
       # <numeral>[-<sufix>]
       version, sufix = string
-                       .match(/([\d\.]+)(?:\-)?(.*)?/)
-                       .captures
+        .match(/([\d\.]+)(?:\-)?(.*)?/)
+        .captures
       # <sufix>:= [<pre>][+<build>]
       @pre, @build = sufix.split('+', 2).map { |s| s.empty? ? false : s }
       # <numeral>:= <major>.<minor>.<patch>
       @major, @minor, @patch = version
-                               .match(/(\d+)\.(\d+)\.(\d+)/)
-                               .captures
-                               .map(&:to_i)
+        .match(/(\d+)\.(\d+)\.(\d+)/)
+        .captures
+        .map(&:to_i)
     end
 
     def reset(what)
@@ -45,6 +46,17 @@ module Vump
       @major += 1
     end
 
+    def bump(what)
+      case what
+      when :patch
+        bump_patch
+      when :minor
+        bump_minor
+      when :major
+        bump_major
+      end
+    end
+
     def to_s
       str = "#{@major}.#{@minor}.#{@patch}"
       str << "-#{@pre}" if @pre

data/lib/vump/vump.rb

@@ -0,0 +1,96 @@
+require 'vump/cli/reporter'
+require 'vump/logger/logger'
+require 'vump/modules/sheep_a_changelog'
+require 'vump/modules/version_file'
+require 'vump/modules/package_json'
+require 'vump/modules/package_lock_json'
+require 'vump/git/git'
+require 'vump/semver/semver'
+
+module Vump
+  class Vump
+    attr_reader :logger
+
+    def initialize(base_path, arg, options)
+      @base_path = base_path
+      @arg = arg
+      @options = options
+      @logger = ::Vump::Logger.new(@options)
+      @reporter = Reporter.new(@options)
+      @reporter.report_preamble(@base_path, @arg, @options)
+      @options[:logger] = @logger
+      @git = Git.new(@base_path, @options)
+    end
+
+    def all_modules
+      [
+        ::Vump::VersionFile,
+        ::Vump::SheepAChangelog,
+        ::Vump::PackageJson,
+        ::Vump::PackageLockJson,
+      ]
+    end
+
+    def load_modules
+      version_modules = all_modules.map { |m| m.new(@base_path, @options) }
+      relevant_modules = version_modules.select(&:relevant?)
+      @reporter.add_loaded_modules(version_modules)
+      @reporter.add_relevant_modules(relevant_modules)
+      relevant_modules
+    end
+
+    def read_versions(modules)
+      modules.map do |mod|
+        version = mod.read
+        @reporter.add_read_version(mod, version)
+        version
+      end
+    end
+
+    def select_version(versions)
+      @reporter.report_module_overview
+      if versions.uniq.length > 1
+        @logger.warn("Inconsitent version records: #{versions}")
+        return false
+      end
+      @logger.info(
+        "Single version extracted from all modules: #{versions.first}"
+      )
+      versions.first
+    end
+
+    def write_versions(modules, version)
+      modules.map do |mod|
+        mod.write(version)
+        @logger.debug("Writing new version \"#{version}\"", mod.class)
+      end
+      @logger.info("All relevant modules written \"#{version}\"")
+
+      if @git.loaded?
+        commit(modules, version) unless @options[:no_git]
+      else
+        @logger.info('Not in a git repository, no stage or commit.')
+      end
+    end
+
+    def commit(modules, version)
+      files_to_stage = modules.map(&:to_stage).flatten
+      @git.stage(files_to_stage)
+      @git.tag(version) if @git.commit(version)
+    end
+
+    def bump(arg = false, pre = false, build = false)
+      modules = load_modules
+      version = select_version(read_versions(modules))
+      semver = Semver.new(version)
+      semver.bump(arg) if arg
+      semver.pre = pre if pre
+      semver.build = build if build
+      write_versions(modules, semver.to_s)
+    end
+
+    def help
+      @reporter.help
+    end
+  end
+end

data/vump.gemspec

@@ -1,18 +1,16 @@
-require File.expand_path('lib/vump/version', __dir__)
-require File.expand_path('lib/vump/meta', __dir__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
+require 'vump/meta'
 
 Gem::Specification.new do |s|
-  s.name        = 'vump'
-  s.version     = Vump::VERSION
-  s.homepage    = 'https://github.com/grissius/vump'
-  s.license     = 'MIT'
-  s.author      = 'Jaroslav Šmolík'
-  s.email       = 'grissius@gmail.com'
+  s.name = Vump::Meta.name
+  s.version = Vump::Meta.version
+  s.homepage = Vump::Meta.homepage
+  s.license = Vump::Meta.license
+  s.author = Vump::Meta.author
+  s.email = Vump::Meta.email
 
-  s.summary     = Vump::SUMMARY
-  s.description = <<-DESCRIPTION
-  Semantic version bumper. CLI tool to easily manage projects using semver and automate menial version raising.
-DESCRIPTION
+  s.summary = Vump::Meta.summary
+  s.description = Vump::Meta.description
 
   s.files = Dir['bin/*',
                 'lib/**/*',
@@ -21,13 +19,19 @@ DESCRIPTION
                 'README*',
                 'VERSION']
   s.executables = Dir['bin/*'].map { |f| File.basename(f) }
-  s.has_rdoc    = 'yard'
 
   s.required_ruby_version = '>= 2.2'
 
+  s.add_runtime_dependency 'command_line_reporter', '~> 4.0.0'
+  s.add_runtime_dependency 'git', '~> 1.5'
   s.add_runtime_dependency 'keepachangelog', '~> 0.5.3'
+  s.add_runtime_dependency 'sheep-a-changelog', '~> 0.3.0'
 
+  s.add_development_dependency 'coveralls', '~> 0.8'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.6'
+  s.add_development_dependency 'rspec-cheki', '~> 0.1'
+  s.add_development_dependency 'rubocop', '~> 0.64.0'
+  s.add_development_dependency 'simplecov', '~> 0.12'
   s.add_development_dependency 'yard', '~> 0.9'
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: vump
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0.pre.alpha.1
 platform: ruby
 authors:
 - Jaroslav Šmolík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: command_line_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: keepachangelog
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: sheep-a-changelog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +108,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: rspec-cheki
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.64.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.64.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -66,29 +164,31 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: "  Semantic version bumper. CLI tool to easily manage projects using
-  semver and automate menial version raising.\n"
+description: Semantic version bumper. CLI tool to easily manage projects using semver
+  and automate menial version raising.
 email: grissius@gmail.com
 executables:
 - vump
 extensions: []
 extra_rdoc_files: []
 files:
-- README.adoc
+- LICENSE
+- README.md
 - VERSION
 - bin/vump
-- lib/cli.rb
-- lib/vump.rb
+- lib/vump/cli/cli.rb
+- lib/vump/cli/reporter.rb
+- lib/vump/git/git.rb
+- lib/vump/logger/logger.rb
 - lib/vump/meta.rb
-- lib/vump/semver/monkey/keepachangelog.rb
+- lib/vump/modules/base_file_module.rb
+- lib/vump/modules/base_module.rb
+- lib/vump/modules/package_json.rb
+- lib/vump/modules/package_lock_json.rb
+- lib/vump/modules/sheep_a_changelog.rb
+- lib/vump/modules/version_file.rb
 - lib/vump/semver/semver.rb
-- lib/vump/semver/version_modules/file_modules/keepachangelog.rb
-- lib/vump/semver/version_modules/file_modules/npm.rb
-- lib/vump/semver/version_modules/file_modules/npm_lock.rb
-- lib/vump/semver/version_modules/file_modules/version_file.rb
-- lib/vump/semver/version_modules/read_write_version_module.rb
-- lib/vump/semver/version_modules/vcs_modules/git.rb
-- lib/vump/version.rb
+- lib/vump/vump.rb
 - vump.gemspec
 homepage: https://github.com/grissius/vump
 licenses:
@@ -105,12 +205,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Raise version version in root of semver project.