incr 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8a3dac55072e2ed0833b9c979c22128a371b5aa
-  data.tar.gz: 1666ac7d4d8636eac128c3e7ed72983a31395385
+  metadata.gz: ddf50651ee57b760d253bb3e7d275d8bd382636d
+  data.tar.gz: 4461847a7d0f909d2be997f825606211b7b5328b
 SHA512:
-  metadata.gz: 2dc7f3010a7c1c81f3dd0618be1a3cc83646d131af98d26e4d3725de32612a1945d759da932f0293b0e9bfb96429eb359b250d13b0e4994dfc696972e57575cf
-  data.tar.gz: 7a4dfb44e61584d3c4c584adb2c934f694885e7ee69f605efa2a9d8c0d6406de0479a01be4da347d0aec795ea8f744d123af792a27888e82bfab5f7065c38b33
+  metadata.gz: cc0ad79e813e7fae4bb8e91f151bae7cf07187e533e3eb612c71ad5a258f59c067cd493f5eecac84153b52724a05ad9101cfd104229ac7010ae6e357f7064c27
+  data.tar.gz: 6a17f0eaba6a2233e182ed14412e628447aa19db2bffe268d3b2fcb876ba19d843458866aeb5e5366eff0afacc9b64d8e8ebd95842a26bb163ef6bad5b20d590

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    incr (0.1.0)
+    incr (0.3.0)
+      git (= 1.3.0)
       gli (= 2.17.1)
-      rugged (= 0.26.0)
       sem_version (= 2.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    git (1.3.0)
     gli (2.17.1)
-    rugged (0.26.0)
     sem_version (2.0.1)
 
 PLATFORMS
@@ -20,4 +20,4 @@ DEPENDENCIES
   incr!
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/README.md

@@ -11,17 +11,24 @@
   <a href="https://travis-ci.org/jcouture/incr"><img src="http://img.shields.io/travis/jcouture/incr.svg" /></a>
 </p>
 
-## Installation
+## What does `incr` do?
 
-```shell
-~> gem install incr
-```
+The process is detailed as follow:
 
-incr depends on the [Rugged](https://github.com/libgit2/rugged) Ruby bindings for [libgit2](https://libgit2.github.com/). You need to have `CMake` and `pkg-config` installed on your system to be able to build the included version of libgit2.
-On OS X, after installing [Homebrew](https://brew.sh/), you can get CMake with:
+*  Find the relevant file(s) (e.g.: `package.json` and `package-lock.json` or `mix.exs`).
+* Determine the existing version number.
+* Increment the specified segment. If you increment the minor segment, the patch segment is set to 0 and the same goes for the major segment, the minor and patch segments are set to 0.
+* Write the newly incremented version number in the relevant file(s).
+* Create a new `git commit` with the relevant file with the version number as the default message (e.g.: 0.2.1).
+* Create a new `git tag` pointing to the new `git commit` with the version number prefixed by a 'v' as the name (e.g.: v0.2.1).
+* 💥
+
+## Installation
+
+### incr
 
 ```shell
-~> brew install cmake
+~> gem install incr
 ```
 
 ## Usage

data/incr.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency('gli', '2.17.1')
   spec.add_runtime_dependency('sem_version', '2.0.1')
-  spec.add_runtime_dependency('rugged', '0.26.0')
+  spec.add_runtime_dependency('git', '1.3.0')
 end

data/lib/incr.rb

@@ -1,4 +1,4 @@
-require 'incr/service/git'
+require 'incr/service/repository'
 require 'incr/service/version'
 require 'incr/service/file_helper'
 require 'incr/command/npm'

data/lib/incr/command/mix.rb

@@ -16,14 +16,14 @@ module Incr
         file_version = file_content.match(/version:\W*\"(\d*.\d*.\d*)",/)[1]
         old_version = SemVersion.new(file_version)
         new_version = Incr::Service::Version.increment_segment(old_version, @segment)
-        Incr::Service::FileHelper.replace(MIXFILE_FILENAME, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
+        Incr::Service::FileHelper.replace_once(MIXFILE_FILENAME, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
 
         puts "v#{new_version.to_s}"
 
-        git = Incr::Service::Git.new('.')
-        git.add(MIXFILE_FILENAME)
-        oid = git.commit(new_version.to_s)
-        git.tag("v#{new_version.to_s}", oid)
+        repository = Incr::Service::Repository.new('.')
+        repository.add(MIXFILE_FILENAME)
+        repository.commit(new_version.to_s)
+        repository.tag("v#{new_version.to_s}")
       end
 
       private

data/lib/incr/command/npm.rb

@@ -21,16 +21,16 @@ module Incr
         old_version = SemVersion.new(file_version)
         new_version = Incr::Service::Version.increment_segment(old_version, @segment)
 
-        Incr::Service::FileHelper.replace(PACKAGE_JSON_FILENAME, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
-        Incr::Service::FileHelper.replace(PACKAGE_LOCK_JSON_FILENAME, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
+        Incr::Service::FileHelper.replace_once(PACKAGE_JSON_FILENAME, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
+        Incr::Service::FileHelper.replace_once(PACKAGE_LOCK_JSON_FILENAME, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
 
         puts "v#{new_version.to_s}"
 
-        git = Incr::Service::Git.new('.')
-        git.add(PACKAGE_JSON_FILENAME)
-        git.add(PACKAGE_LOCK_JSON_FILENAME)
-        oid = git.commit(new_version.to_s)
-        git.tag("v#{new_version.to_s}", oid)
+        repository = Incr::Service::Repository.new('.')
+        repository.add(PACKAGE_JSON_FILENAME)
+        repository.add(PACKAGE_LOCK_JSON_FILENAME)
+        repository.commit(new_version.to_s)
+        repository.tag("v#{new_version.to_s}")
       end
 
       private

data/lib/incr/service/file_helper.rb

@@ -1,9 +1,9 @@
 module Incr
   module Service
     class FileHelper
-      def self.replace(filename, old_text, new_text)
+      def self.replace_once(filename, old_text, new_text)
         old_content = File.read(filename)
-        new_content = old_content.gsub(/#{Regexp.escape(old_text)}/, new_text)
+        new_content = old_content.sub(/#{Regexp.escape(old_text)}/, new_text)
         File.open(filename, 'w') { |file| file << new_content }
       end
     end

data/lib/incr/service/repository.rb

@@ -0,0 +1,23 @@
+require 'git'
+
+module Incr
+  module Service
+    class Repository
+      def initialize(path)
+        @git = Git.init(path)
+      end
+
+      def add(filename)
+        @git.add(filename)
+      end
+
+      def commit(message)
+        @git.commit(message)
+      end
+
+      def tag(name)
+        @git.add_tag(name)
+      end
+    end
+  end
+end

data/lib/incr/version.rb

@@ -1,3 +1,3 @@
 module Incr
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jean-Philippe Couture
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: rugged
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 1.3.0
 description: 
 email:
 - jcouture@gmail.com
@@ -72,7 +72,7 @@ files:
 - lib/incr/command/mix.rb
 - lib/incr/command/npm.rb
 - lib/incr/service/file_helper.rb
-- lib/incr/service/git.rb
+- lib/incr/service/repository.rb
 - lib/incr/service/version.rb
 - lib/incr/version.rb
 homepage: https://github.com/jcouture/incr
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Tasteful utility to increment the version number and create a corresponding

data/lib/incr/service/git.rb

@@ -1,46 +0,0 @@
-require 'rugged'
-
-module Incr
-  module Service
-    class Git
-      def initialize(path)
-        @repository = Rugged::Repository.new(path)
-        @index = @repository.index
-        @author = @repository.head.target.author
-      end
-
-      def add(filename)
-        @index.add(filename)
-        @index.write
-      end
-
-      def commit(message)
-        options = {}
-        options[:tree] = @index.write_tree(@repository)
-
-        author = @author.clone
-        author[:time] = Time.now
-
-        options[:author] = author
-        options[:committer] = author
-        options[:message] ||= message
-        options[:parents] = @repository.empty? ? [] : [ @repository.head.target ].compact
-        options[:update_ref] = 'HEAD'
-
-        Rugged::Commit.create(@repository, options)
-      end
-
-      def tag(name, target)
-        author = @author.clone
-        author[:time] = Time.now
-
-        # annotation = {
-        #   tagger: author,
-        #   message: 'a message?'
-        # }
-        # @repository.tags.create(name, target, annotation)
-        @repository.tags.create(name, target)
-      end
-    end
-  end
-end