gemspec-bump 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7ce027c8b2fd74a6067ab35b09c98964ae30def
+  data.tar.gz: e814323485ac6a4bcdd3c031d5e3d4e1842ebd68
+SHA512:
+  metadata.gz: 69d1b03dc35f2f5a86147e34ce1fa6dd1317374799e35a7819a90ee4ed404e358d60e01075373e9e98db404fb74d6ce0525915be65e8ab5f5d222aa5d9147490
+  data.tar.gz: 43a143909720f7d725a59c336145512a69d47080fedad6f5dec13a827db971385cbcbd0f937b58bc1bfa3686f7a835bd36bbf3651956426de283fc49e70fc358

data/.gitignore

@@ -0,0 +1,3 @@
+/pkg/
+/Gemfile.lock
+/LICENSES

data/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in gemspec.gemspec
+gem 'gemspec', '~> 0.2'
+gemspec glob: '*.gemspec'

data/README-VERSIONPATCH.md

@@ -0,0 +1,29 @@
+#Usage: gemspec-version VERSION VERSION_DIFF
+
+gemspec-version combines a VERSION string with a VERSION_DIFF string.
+A version is a series of integers seperated by dots.
+A versiondiff is a series of integers, optionaly prepended by the + or - sign.
+
+Each VERSION integer is combined with its corresponding VERSION_DIFF integer in the following
+fashion:
+
+- An unsigned integer overwrites the VERSION integer.
+- A signed integer (+ or -) is added to the VERSION integer.
+- The righter-most VERSION_DIFF integer combines with the righter-most VERSION integer
+
+##Examples:
+  #Bump the third digit by 1
+  gemspec-version 1.1.1 +1
+  => 1.1.2
+
+  #Bump the second digit by 1, zeroing the third
+  gemspec-version 1.1.1 +1.0
+  => 1.1.2
+
+  #Set the first digit to 5, bump the second by one, and set the last one to 0
+  gemspec-version 1.0.1 5.+1.0
+  => 5.1.0
+
+  #Bump the second digit by 3; set the last one to 4
+  gemspec-version 1.1.1 +3.4
+  => 1.4.4

data/README.md

@@ -0,0 +1,25 @@
+#gemspec-bump
+
+A library for combining `Version`s with `VersionDiff`s into new `Version`s.
+
+##Basic 
+
+The basic functionality is exposed in the CLI via the `versionpatch` and `versionpatch-file` executables.
+See README-VERSIONPATCH.md for how to use `versionpatch`.
+
+See the specs or read the code for in-ruby examples of the basic functionality.
+
+## gemspec-bump
+`gemspec-bump` it assumes you’re in a git repo that has the VERSION and VERSION_FOR_HUMANS files in its root, of which each contains a version string, and that you’re on a non-master branch (
+e.g. a release branch or your develop branch if you’re using git flow).
+
+The executable gets a new version for at least the VERSION version by either opening the VERSION file in your text editor (if no argument is given) or by applying arguments as VersionDiffs to VERSION and VERSION_FOR_HUMANS respectively 
+(the latter is optional). It writes the new version(s), creates a commit, merges it with master, tags the master merge commit appropriately, merges the merge commit back to the original branch, and
+outputs a reverse, decorated, one-line commit log so that you can see where you’re at.
+
+If you’re on a branch based on master, this whole chain should succeed without any need for additional user input.
+
+See `gemspec-bump --help` for more information.
+
+## What’s it got to do with gemspecs
+Nothing. This was made to be used in conjuction with my `gemspec` gem so why not use its namespace.

data/Rakefile

@@ -0,0 +1 @@
+task :default => :test

data/VERSION

@@ -0,0 +1 @@
+lib/gemspec/bump/VERSION

data/VERSIONING.md

@@ -0,0 +1,18 @@
+## Versioning
+### Version Number for Machines
+
+This gem uses a slightly modified version of the **SemVer** specification, namely:
+```ruby
+    spec.version = "BREAKING.PATCHES.NONBREAKING"
+```
+You can use this versioning with your dependency tools, only you have a somewhat stronger guarantee that your
+code won't break if you limit yourself to the third number, but you need to allow second level updates in order to
+get (security and other) patches.
+
+### Version Number for Humans
+Since the above-described type of versioning doesn't tell you anything about the functional state of the gem (you can go from a "hello world" to a full blown operating system
+without making a breaking change, as long as your operating system prints "hello world" to the screen) (SemVer, when used correctly, doesn't tell anything about the functional state of a software package either), a second, human-friendly version number can be found in `spec.metadata[:human_version]`.
+
+The magnitude of this version number shall be made to correspond to actual functional changes in the software. If I've worked a lot on the package, I'll make it move a lot, but unless I've made breaking changes, I'll stick to only moving the third number in the `spec.version` version.
+
+This number is for you. If you see it increase a lot, it probably means much more new goodies, but is less strictly defined then the version number for the machine.  (I reserve the right to later change the way I change this number).

data/VERSION_FOR_HUMANS

@@ -0,0 +1 @@
+lib/gemspec/bump/VERSION_FOR_HUMANS

data/bin/gemspec-bump

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'shellwords'
+
+def usage
+  <<-EOF.gsub(/^  /,'')
+    Usage: gemspec-bump [VERSION-diff [VERSION_FOR_HUMANS-diff]]
+
+    Apply given diffs to VERSION and VERSION_FOR_HUMANS respectively where VERSION and VERSION_FOR_HUMANS are files (possibly symlinks) in the root of the git repo, which should
+    contain version strings (integers seperated by dots) and be managed by git.
+
+    At least VERSION-diff must be present. If it is not, $EDITOR is open for both.
+
+    If at the end VERSION differs from what it is at the top of the current branch, 
+    the VERSION file will be committed with a generated message.
+    This commit will be merged into master and, if the merge is sucessful, the top of master will be
+    tagged `v$(cat VERSION)` and `h$(cat VERSION_FOR_HUMANS)` and merged back into the previous branch.
+  EOF
+end
+
+require 'gemspec/git'
+require 'gemspec/bump'
+include Gemspec
+Git.cdroot!
+$? == 0 or (
+  warn "Not in a git repository"
+  exit 1
+)
+
+if (original_branch=`git branch`.split("\n").grep(/^\*/)[0].sub(/^\*\s*/,'')) == 'master'
+  warn "Bumping must be done on a non-master branch.\n If succesful, the result will be merged into master and back to the original branch"
+end
+
+new_version = nil
+new_version_for_humans = nil
+
+if ARGV[0]
+  old_version = File.read('VERSION').chomp
+  new_version = Version.new(old_version).apply(VersionDiff.new(ARGV[0])).to_s
+  File.write('VERSION', new_version + "\n")
+
+  if ARGV[1]
+    old_version_for_humans = File.read('VERSION_FOR_HUMANS').chomp
+    new_version_for_humans = Version.new(old_version_for_humans).apply(VersionDiff.new(ARGV[1])).to_s
+    File.write('VERSION_FOR_HUMANS', new_version_for_humans + "\n")
+  end
+else
+  system(ENV['EDITOR'], 'VERSION', 'VERSION_FOR_HUMANS')
+end
+
+if `git status --porcelain "$(readlink VERSION)"`.chomp == ""
+  system(ENV['EDITOR'], 'VERSION')
+end
+
+if `git status --porcelain "$(readlink VERSION)"`.chomp == ""
+  warn "A bump must change VERSION"
+  exit 1
+end
+
+new_version = File.read('VERSION').chomp
+new_version_for_humans = File.read('VERSION_FOR_HUMANS').chomp
+
+files_to_git_add = %w[VERSION VERSION_FOR_HUMANS].map! {|f| File.symlink?(f) ? File.readlink(f) : f }
+system('git', 'add','--', *files_to_git_add)
+
+msg = "Bump to VERSION to v#{new_version}\n\nVERSION_FOR_HUMANS == #{new_version_for_humans}"
+system <<-EOF
+ set -e
+ git commit -m #{Shellwords.escape msg}
+ git checkout master
+ git merge @{-1} --no-edit --no-ff
+ git tag v#{Shellwords.escape new_version}
+ git tag h#{Shellwords.escape new_version_for_humans} || true
+ git checkout @{-1}
+ git merge master
+ git log --oneline --decorate | tac
+EOF

data/bin/versionpatch

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+require 'gemspec/bump'
+include Gemspec
+
+def usage
+  File.read(File.expand_path('../../README-VERSIONPATCH.md', __FILE__))
+end
+
+if ARGV.delete('-h') || ARGV.delete('--help')
+  puts usage
+  exit
+end
+
+ARGV.size == 2 or (
+  warn usage
+  exit 1
+)
+puts Version.new(ARGV.first).apply(VersionDiff.new(ARGV.last))

data/bin/versionpatch-file

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+require 'gemspec/version'
+include Gemspec
+
+def usage
+  <<-EOF.gsub(/^  /,'')
+    Usage: versionpatch-file VERSIONFILE VERSIONDIFF
+
+    Works the same as versionpatch expect the VERSION string is read from VERSIONFILE and the 
+    result is also written to VERSIONFILE.
+
+    See `versionpatch --help` for more information.
+  EOF
+end
+
+if ARGV.delete('-h') || ARGV.delete('--help')
+  puts usage
+  exit
+end
+
+ARGV.size == 1 or (
+  warn usage
+  exit 1
+)
+old_version = File.read(ARGV.first)
+new_version = Version.new(ARGV[0]).apply(VersionDiff.new(ARGV[1]))
+File.write(ARGV[0], new_version)

data/gemspec.gemspec

@@ -0,0 +1,35 @@
+# coding: utf-8
+
+#Naming utils, git utils, and default boilerplate
+require 'gemspec'
+
+#This is a place to put custom overrides to Gemspec.boilerplate
+begin; require_relative 'gemspec.rb'; rescue LoadError; end
+
+Gem::Specification.new do |s|
+
+  #Name is the name of the project root directory
+  s.name           = Gemspec.base_dirname(__FILE__)
+
+  Gemspec.boilerplate(s)
+
+  #s.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
+
+  #####Must change
+  s.summary       = %q{A version bumper}
+  s.description   = %q{A flexible and concise version bumper that can, in a single command, take care of all the git ceremony in a git-flow compatible fashion . }
+  s.licenses      = %w[GPL-2.0]
+
+
+  #####Unlikely to change
+  s.email         = [ `git config user.email`.chomp ]
+  s.homepage      = "https://github.com/#{`git config github.username`.chomp}/#{s.name}.git"
+  $? == 0 or s.homepage = nil
+  ###################################
+
+  #Dependencies
+  s.add_dependency 'gemspec', '~> 0'
+  s.add_development_dependency 'rake', '~> 10.4'
+  s.add_development_dependency 'minitest-documentation'
+
+end

data/lib/gemspec/bump.rb

@@ -0,0 +1,49 @@
+require "gemspec/bump/version"
+
+module Gemspec
+  class Version
+    IllegalFormat = Class.new(ArgumentError)
+
+    attr_accessor :data
+
+    def initialize(string_or_array)
+      @data = string_or_array
+      @data = @data.split('.') if string_or_array.is_a? String
+      raise IllegalFormat, to_s unless @data.all? {|item| item.is_a? Integer or item =~ /^\d*$/ }
+      @data.map!(&:to_i)
+    end
+
+    def ==(other)
+      data == other.data
+    end
+
+    def to_s
+      @data.join(".")
+    end
+
+    def apply(diff)
+      my_data_r = data.reverse
+      diff_data_r = diff.data.reverse
+      result = my_data_r.zip(diff_data_r).map do |first, second|
+        first = if second =~ /^[+-]/
+            first + second.to_i
+          else
+            (second and second.to_i) or first
+          end
+        first
+      end.reverse
+      Version.new(result)
+    end
+  end
+
+  class VersionDiff
+    IllegalFormat = Class.new(ArgumentError)
+
+    attr_accessor :data
+
+    def initialize(string)
+      @data = string.split('.')
+      raise IllegalFormat, string unless @data.all? {|item| item =~ /^(\+|\-)?\d*$/ }
+    end
+  end
+end

data/lib/gemspec/bump/VERSION

@@ -0,0 +1 @@
+0.3.1

data/lib/gemspec/bump/VERSION_FOR_HUMANS

@@ -0,0 +1 @@
+0.3

data/lib/gemspec/bump/version.rb

@@ -0,0 +1,6 @@
+module Gemspec
+  class Bump
+    VERSION = File.read(File.expand_path("../VERSION", __FILE__))
+    VERSION_FOR_HUMANS = File.read(File.expand_path("../VERSION_FOR_HUMANS", __FILE__))
+  end
+end

data/rakelib/gem.rake

@@ -0,0 +1,13 @@
+require 'rubygems/package_task'
+$:.unshift(File.expand_path('../lib',__FILE__))
+
+$gemspec = Gem::Specification.load(Dir["*.gemspec"][0])
+files = Rake::FileList.new(Gemspec::Git.ls_files)
+
+Gem::PackageTask.new($gemspec) { }
+task :gem => :chmod
+task :chmod do
+  files.each do |file|
+    chmod 'o+r', file unless File.world_readable?(file)
+  end
+end

data/rakelib/license.rake

@@ -0,0 +1,19 @@
+directory "LICENSES"
+$gemspec = Gem::Specification.load(Dir["*.gemspec"][0])
+
+file "LICENSES/.info" => "gemspec.gemspec" do |t|
+  mkdir_p "LICENSES"
+
+  licenses_dir = File.expand_path('../../share/gemspec/licenses/', `gem which gemspec`.chomp)
+  $? == 0 or licenses_dir = File.expand_path('licenses/')
+
+  $gemspec.licenses.each do |license|
+    cp File.join(licenses_dir, license), "LICENSES/#{Shellwords.escape license}"
+  end
+  File.write(t.name, "This directory contains the licenses you can use with this gem\n")
+end
+
+desc "Fill LICENSES/ with licenses according to gemspec.gemspec and view them"
+task 'license' => 'LICENSES/.info' do
+  sh "cd LICENSES/; less *"
+end

data/rakelib/release.rake

@@ -0,0 +1,17 @@
+require 'gemspec/git'
+
+desc "Push master to origin, build gem, and push it"
+task 'release' => 'gem' do
+  Gemspec::Git.cdroot!
+  Gemspec::Git.clean? or (
+    warn "Need to clean up before releasing"
+    exit 1
+  )
+  sh "git checkout master"
+  s = Gem::Specification.load('gemspec.gemspec')
+  sh <<-EOF
+    git push origin master &
+    rake gem && gem push pkg/#{s.name}-#{s.version}.gem
+    wait
+  EOF
+end

data/rakelib/test.rake

@@ -0,0 +1,7 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "lib" << "test" << "spec"
+  t.pattern = 'test/**/*_{test,spec}.rb'
+  t.verbose = true
+end

data/test/gemspec-bump_spec.rb

@@ -0,0 +1,64 @@
+require 'minitest_helper'
+
+describe "Gemspec::Version" do
+  include Gemspec
+
+  describe "Valid versions" do
+
+    valid_versions = %w[1.1 1.0.0  443.432.432.432]
+    valid_versions.each do |valid_version|
+      it "should recognize #{valid_version} as a valid version" do
+        Gemspec::Version.new(valid_version)
+      end
+    end
+  end
+
+  describe "Invalid versions" do
+
+    invalid_versions = %w[1a.1 fdas1.0.0  443.432.432.432_pre 1.+4.0, -1.3.4 ]
+    invalid_versions.each do |valid_version|
+      it "should not recognize #{valid_version} as a valid version" do
+        assert_raises(Gemspec::Version::IllegalFormat) { Gemspec::Version.new(valid_version) }
+      end
+    end
+  end
+
+  describe "Applying version diff" do
+    #version, diff, result
+    [
+    %w[1.0.0 1.+1.0 1.1.0],
+    %w[1.0.1 1.+1.2 1.1.2],
+    %w[1.1.1 1.-1.2 1.0.2],
+    %w[1.1.1 +1.2 1.2.2],
+    %w[1.1.1.1 +3.+1.2 1.4.2.2],
+    ].each do |version, diff, result|
+      it "should combine #{version} with #{diff} into #{result}" do
+        assert_equal Gemspec::Version.new(result), Gemspec::Version.new(version).apply(Gemspec::VersionDiff.new(diff)) 
+      end
+    end
+  end
+
+end
+
+describe "Gemspec::VersionDiff" do
+  describe "Valid diffs" do
+
+    valid_diffs = %w[1.1 1.0.0  443.432.432.432]
+    valid_diffs += %w[1.+1 1.-1.0  443.-432.432.+432 -1.0.4]
+    valid_diffs.each do |valid_diff|
+      it "should recognize #{valid_diff} as a valid diff" do
+        Gemspec::VersionDiff.new(valid_diff)
+      end
+    end
+  end
+
+  describe "Invalid diffs" do
+
+    invalid_diffs = %w[1a.1 fdas1.0.0  443.432.432.432_pre 1.+a4.0, -a1.3.4 ]
+    invalid_diffs.each do |valid_diff|
+      it "should not recognize #{valid_diff} as a valid diff" do
+        assert_raises(Gemspec::VersionDiff::IllegalFormat) { Gemspec::VersionDiff.new(valid_diff) }
+      end
+    end
+  end
+end

data/test/minitest_helper.rb

@@ -0,0 +1,11 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+$gemspec = Gem::Specification.load(Dir["*.gemspec"][0]) 
+require $gemspec.name.tr('-','/')
+
+require 'minitest/autorun'
+require 'minitest/documentation'
+
+Minitest::Test.i_suck_and_my_tests_are_order_dependent!
+Minitest.should_shuffle_suites = false
+

metadata

@@ -0,0 +1,118 @@
+--- !ruby/object:Gem::Specification
+name: gemspec-bump
+version: !ruby/object:Gem::Version
+  version: 0.3.1
+platform: ruby
+authors:
+- Petr Skocik
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2015-06-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: gemspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: minitest-documentation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 'A flexible and concise version bumper that can, in a single command,
+  take care of all the git ceremony in a git-flow compatible fashion . '
+email:
+- pskocik@gmail.com
+executables:
+- gemspec-bump
+- versionpatch
+- versionpatch-file
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- README-VERSIONPATCH.md
+- README.md
+- Rakefile
+- VERSION
+- VERSIONING.md
+- VERSION_FOR_HUMANS
+- bin/gemspec-bump
+- bin/versionpatch
+- bin/versionpatch-file
+- gemspec.gemspec
+- lib/gemspec/bump.rb
+- lib/gemspec/bump/VERSION
+- lib/gemspec/bump/VERSION_FOR_HUMANS
+- lib/gemspec/bump/version.rb
+- rakelib/gem.rake
+- rakelib/license.rake
+- rakelib/release.rake
+- rakelib/test.rake
+- test/gemspec-bump_spec.rb
+- test/minitest_helper.rb
+homepage: https://github.com/pjump/gemspec-bump.git
+licenses:
+- GPL-2.0
+metadata:
+  namespaced_path: gemspec/bump
+  constant_name: Gemspec::Bump
+  human_version: |
+    0.3
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
+specification_version: 4
+summary: A version bumper
+test_files:
+- test/gemspec-bump_spec.rb
+- test/minitest_helper.rb