versioneer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c4246187b1561c23ad5a84960dfa3de968b5f2
-  data.tar.gz: 37406211a96ff040d547c51485342ac4595b5634
+  metadata.gz: db1cf2137012772d72050fc4d52ba9c2f8d8aef8
+  data.tar.gz: 232edbd0fbbdde7897ce25ff3bbf2f45e6fee88b
 SHA512:
-  metadata.gz: fc1ad04545c79f3e4528f6b254dfba6bf54c9835bd24931de6f8b4ae36e3b265123f14999d72771e7d189866ed0c0f0b1db708be1206d66b0b788775721eb65c
-  data.tar.gz: b9ebba4412af3ad1b1fecc780aa93541ab5b9e3b329a992963b063d9292526e8d09151c387ec032a3f0d153146c533a344cf5c3759498e3d70843e4293f1095a
+  metadata.gz: c6b50c09098f98afdab48d376a669e76210efe28397cb44af17ee8a9212574a3fc0b13081bbb0b7a1b764d5705fe233035d86c51b3aae9c900389f65d4ced652
+  data.tar.gz: 9f7ea747337ff8e2c90ea786c5d8336ecea9a6ee753a32ed6b8b1b132c4ce61ef28c4a84f6079725e1b3a8ce750bfe05cb6e5201b6da78f5998479b6d4410a85

data/.travis.yml

@@ -1,8 +1,14 @@
 sudo: false
+matrix:
+  fast_finish: true
 language: ruby
 rvm:
   - 2.3.1
+  - 1.9.2
+  - 1.8.7
 before_install:
   - gem update bundler
 after_success:
-  - bundle exec codeclimate-test-reporter
+  - ruby -e 'exit RUBY_VERSION > "2"' && bundle exec codeclimate-test-reporter
+notifications:
+  email: false

data/.versioneer.yml

@@ -3,7 +3,6 @@
 
 type: Git
 bump_segment: minor
-environment: development
 prereleases:
   - alpha
   - beta

data/Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0"
+  if RUBY_VERSION > '2'
+    gem "simplecov"
+    gem "codeclimate-test-reporter", "~> 1.0.0"
+  end
 end

data/README.md

@@ -10,7 +10,7 @@ __Dynamic project versioning (alpha/beta/rc) from commits since last Git Tag.__
 
 Versioneer **determines a project's version** from the latest source-control tag, then **adjusts automatically** by adding/bumping prereleases based on changes made since the last tagged release.
 
-Integration tested on **UNIX/macOS and Windows**.
+Integration tested on **UNIX/macOS and Windows**. Matrix testing for **Ruby** ` 1.8` — `2.3`
 
 ## Overview
 

data/bin/versioneer

@@ -1,13 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
 require 'optparse'
 require 'versioneer'
 
 cli_opts = {}
-repo_opts = {
-    environment: 'production'
-}
+repo_opts = {}
 
 opparser = OptionParser.new do |opts|
   opts.banner = [
@@ -17,7 +14,7 @@ opparser = OptionParser.new do |opts|
       '-------------------------------------',
       ' Actions',
       '    %-33s%s' % ['status', 'Report on versions for all environments (default action)'],
-      '    %-33s%s' % ['print', 'Print version number for production, or --env environment'],
+      '    %-33s%s' % ['print', 'Print version number for current environment'],
       '    %-33s%s' % ['init', 'Generate default configuration file'],
       '    %-33s%s' % ['lock', 'Lock (save) current version (for deployments without VCS repo)'],
       '    %-33s%s' % ['unlock', 'Unlock (discard) previously saved version'],
@@ -27,10 +24,10 @@ opparser = OptionParser.new do |opts|
       '',
       ' Options',
   ].join("\n")
-  opts.on('-c FILE', '--config=FILE', 'Config file (.versioneer.yml)') do |v|
+  opts.on('-c FILE', '--config=FILE', 'Config file, default: .versioneer.yml') do |v|
     cli_opts[:config] = v
   end
-  opts.on('-e ENVIRONMENT', '--env=ENVIRONMENT', 'Environment (production)') do |v|
+  opts.on('-e ENVIRONMENT', '--env=ENVIRONMENT', '(development|production) ... overrides system vars, see guide') do |v|
     repo_opts[:environment] = v
   end
   opts.on('-q', '--quiet', 'Silence action output') do |v|

data/lib/versioneer.rb

@@ -1,11 +1,15 @@
-load 'versioneer/runtime_error.rb'
-load 'versioneer/invalid_repo_error.rb'
-load 'versioneer/missing_config_error.rb'
-load 'versioneer/repo.rb'
-load 'versioneer/config.rb'
-load 'versioneer/bypass.rb'
-load 'versioneer/git.rb'
-load 'versioneer/gem_version.rb'
+%w{
+  runtime_error
+  invalid_repo_error
+  missing_config_error
+  repo
+  config
+  bypass
+  git
+  gem_version
+}.each do |f|
+  load "#{File.dirname(File.expand_path(__FILE__))}/versioneer/#{f}.rb"
+end
 
 module Versioneer
 end

data/lib/versioneer/bypass.rb

@@ -1,4 +1,4 @@
-require_relative 'helpers'
+require File.dirname(File.expand_path(__FILE__)) + '/helpers'
 
 module Versioneer
   class Bypass < Repo

data/lib/versioneer/config.rb

@@ -1,6 +1,6 @@
-require_relative 'helpers'
-require_relative 'runtime_error'
-require_relative 'missing_config_error'
+require File.dirname(File.expand_path(__FILE__)) + '/helpers'
+require File.dirname(File.expand_path(__FILE__)) + '/runtime_error'
+require File.dirname(File.expand_path(__FILE__)) + '/missing_config_error'
 require 'yaml'
 
 module Versioneer
@@ -11,8 +11,9 @@ module Versioneer
 
     def initialize(base_dir_or_config_file, repo_options=nil)
       base_dir_or_config_file = base_dir_or_config_file.to_s
+      repo_options = Hash.new unless repo_options.is_a? Hash
 
-      if Dir.exist?(base_dir_or_config_file)
+      if File.directory?(base_dir_or_config_file)
         @config_base = base_dir_or_config_file
         @config_file = File.join(base_dir_or_config_file, DEFAULT_FILE)
         unless File.exist?(@config_file)
@@ -32,7 +33,7 @@ module Versioneer
       @lock_file = File.join(@config_base, params.delete(:lock_file) || DEFAULT_LOCK)
       @repo = nil
       @repo_type = (params.delete(:type) || DEFAULT_TYPE).capitalize.to_sym
-      @repo_options = Hash.new().merge(repo_options.to_h).merge(params.to_h)
+      @repo_options = Hash.new().merge(params).merge(repo_options)
     end
 
     attr_reader :config_file, :lock_file
@@ -41,7 +42,7 @@ module Versioneer
       return @repo unless @repo.nil?
       @repo = case locked?
                 when true
-                  Bypass.new(@config_base, release: version)
+                  Bypass.new(@config_base, :release => version)
                 else
                   unless ::Versioneer.const_defined? @repo_type
                     raise RuntimeError, "Versioneer::#{@repo_type} is an unknown VCS type."

data/lib/versioneer/git.rb

@@ -1,4 +1,4 @@
-require_relative 'helpers'
+require File.dirname(File.expand_path(__FILE__)) + '/helpers'
 
 module Versioneer
   class Git < Repo
@@ -6,7 +6,7 @@ module Versioneer
 
     def initialize(file_within_repo, options=nil)
       super
-      unless Dir.exist?(File.join(file_within_repo, '.git'))
+      unless File.directory?(File.join(file_within_repo, '.git'))
         unless H.lines? `git ls-files #{file_within_repo} --error-unmatch #{H.cl_no_stderr}`
           raise InvalidRepoError, "Not inside a Git repo. (#{file_within_repo})"
         end

data/lib/versioneer/helpers.rb

@@ -26,22 +26,22 @@ module Versioneer
 
       def cl_no_stdout
         {
-            unix: '>/dev/null',
-            windows: '>nul'
+            :unix => '>/dev/null',
+            :windows => '>nul'
         }.fetch(platform)
       end
 
       def cl_no_stderr
         {
-            unix: '2>/dev/null',
-            windows: '2>nul'
+            :unix => '2>/dev/null',
+            :windows => '2>nul'
         }.fetch(platform)
       end
 
       def cl_silence
         {
-            unix: '>/dev/null 2>&1',
-            windows: '>nul 2>&1'
+            :unix => '>/dev/null 2>&1',
+            :windows => '>nul 2>&1'
         }.fetch(platform)
       end
 

data/lib/versioneer/invalid_repo_error.rb

@@ -1,4 +1,4 @@
-require_relative 'runtime_error'
+require File.dirname(File.expand_path(__FILE__)) + '/runtime_error'
 
 module Versioneer
   class InvalidRepoError < RuntimeError

data/lib/versioneer/missing_config_error.rb

@@ -1,4 +1,4 @@
-require_relative 'runtime_error'
+require File.dirname(File.expand_path(__FILE__)) + '/runtime_error'
 
 module Versioneer
   class MissingConfigError < RuntimeError

data/versioneer.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'pry', '~> 0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: versioneer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - BinaryBabel OSS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,42 +28,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: