trop 0.6.19 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 528c3684d5b8d58c956fc4bffea8186d5b9568b3684007039e586fc201a5928c
-  data.tar.gz: 1980f19a8892c9fb7a7b8fa77a7742a68051b75505bf27f46c6daba4b83f5278
+  metadata.gz: d9268ce6ded40e0a1527ed34e01569bac1b0874ccaf7a6ce4f4670751191dc2c
+  data.tar.gz: 37f623a7ea3c96309055b9c225a278366774faba0c7900b99a249db7fe31cc8a
 SHA512:
-  metadata.gz: e381ee7393674373efe1cc4eaffb82fa2adc4334f1d0fee5f44916eb0fdecce185fd80c9d4b16e81332cc9513fb10a90ebbd97a491f71c2286894bb481f743d2
-  data.tar.gz: 816702ae5fcff854234bc199ef1c4431c11b0169ed9b050aa3cd70ed345c5f72e086f91cb78796ec7300f30e53c98dde17dc662232f15572d5a2497a2c9394e9
+  metadata.gz: 232abbcda82bd01233bf116702c966e885ad5a85541268bd51a99d4458a664f19bb5d480616330f68b07af193112a200b14275bcd12db43c2a8defcfc7e2d372
+  data.tar.gz: 937480adab0e4f6db433a1152f179545697222b05ddf70c62d3728540ec1beb6b1e4cf3cee259ec71fd827fe21b4094dc351aa75f5af197702210d47a0321afe

data/Gemfile

@@ -1,34 +1,12 @@
 #source 'https://rubygems.org'
 source 'http://localhost:9292/'
 
+gemspec
 # Add dependencies required to use your gem here.
 # Example:
-gem 'activesupport', '>= 2.3.5', require: false
-gem "poise-service", "~> 1.5", require: false
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'minitest', '~> 5.11'
-  gem 'shoulda', '~> 3.6'
-  gem 'simplecov', '~> 0.16.1'
-  gem 'test-unit', '~> 3.3'
-  gem 'rake', '~> 12.3'
-  gem "factory_bot", "~> 5.0"
-  gem "minitest-reporters", "~> 1.3"
-  gem "bump", "~> 0.8.0"
-  gem "gem_version", "~> 0.0.6"
-  gem "bundler-geminabox", "1.0"
-  gem "git-version-bump", "~> 0.16.0"
-  gem "gem-release", "~> 2.0"
-end
-
 
-gem 'dotenv'
-gem 'bundler', '~> 2.0.1'
-gem 'sentry-raven'
-gem 'colorize'
-gem "faraday", "0.15.4"
-
-
-gem "gem-release", "~> 2.0"
-gem "nokogiri", "~> 1.10"
+end

data/Rakefile

@@ -1,10 +1,9 @@
 require 'rubygems'
 require 'rake'
+require 'bump'
 require 'fileutils'
-
-require_relative './lib/trop'
-
-
+require 'git-version-bump/rake-tasks'
+require "bundler/gem_tasks"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

data/VERSION

@@ -1,2 +1 @@
-Using dsn https://1119c5fd4e7e47b7948c62b22b182fdf@sentry.io/1448013
-0.16.0
+0.7.0

data/lib/trop/gem_version.rb

@@ -0,0 +1,104 @@
+require 'rubygems'
+require 'git'
+require 'logger'
+
+#load File.dirname(__FILE__) + '/../../rakelib/gem_version.rake'
+
+module Trop::GemVersion
+  @@gem_version_file = 'next_gem_version'
+  @@default_commit_message = 'incremented gem version'
+
+  def self.gem_version_file=(str)
+    @@gem_version_file = str
+  end
+
+  def self.next_version
+    init_version_file unless File.exist?(@@gem_version_file)
+    file = File.new(@@gem_version_file, 'r')
+    version = file.gets.chomp
+    raise "#{@@gem_version_file} file corrupt" unless self.version_format_valid?(version)
+    file.close
+    version
+  end
+
+  def self.set_version(version)
+    raise "Invalid version format" unless self.version_format_valid?(version)
+    self.update_version(version)
+  end
+
+  def self.version_format_valid?(version)
+    (version && version =~ /^\d+\.\d+[\.\d+]+$/)
+  end
+
+  def self.init_version_file
+    file = File.new(@@gem_version_file, 'w')
+    file.puts '0.0.1'
+    file.close
+  end
+
+  def self.increment_and_push
+    self.update_version(self.increment_version)
+    self.rewrite_gemspec
+    self.commit_and_push
+  end
+
+  def self.increment_version
+    version = self.next_version
+    components = version.split('.')
+    components.push((components.pop.to_i + 1).to_s)
+    new_version = components.join('.')
+    new_version
+  end
+
+  def self.rewrite_gemspec
+    spec_path = FileUtils.getwd + '/' + Trop::GEMSPEC_NAME
+    spec_gem = Gem::Specification::load(spec_path)
+    spec_gem.version = Trop::GemVersion.next_version
+    File.open(spec_path, 'w') {|f| f.write spec_gem.to_ruby}
+    return spec_gem.version
+  end
+
+  def self.check_lib_version_rb?
+    return false if (Trop::GemVersion::check_lib_version_rb.nil?)
+    true
+  end
+
+  def self.check_lib_version_rb
+    content = Pathname.new(Trop::VERSION_FILE).read
+    version_ok = content.scan(/VERSION.*["']+\d+\.\d+[\.\d+]+["']+/)
+    version_ok
+  end
+
+  def self.update_lib_version_rb
+    if self.check_lib_version_rb?
+      # update
+
+      return
+    end
+
+    puts "version out of sync"
+    assert false
+  end
+
+
+  def self.update_version(new_version)
+    # 1. next_version
+    file = File.new(@@gem_version_file, 'w')
+    file.print new_version
+    file.close
+    # 2. VERSION
+    file = File.new('VERSION', 'w')
+    file.print new_version
+    file.close
+    # 3.
+  end
+
+  def self.commit_and_push(project_directory = nil, msg = nil, &block)
+    g = Git.open(project_directory || Dir.pwd, :log => Logger.new(STDOUT))
+    g.add(@@gem_version_file)
+    yield(g) if block_given?
+    g.commit(msg || @@default_commit_message)
+    g.push
+  end
+end
+

data/lib/trop/version.rb

@@ -1,5 +1,5 @@
 module Trop
-  VERSION = '0.6.9'
+  VERSION = '0.7.0'
   VERSION_NAME = 'trop'
   GEMSPEC_NAME = VERSION_NAME + '.gemspec'
   VERSION_FILE = File.expand_path('version.rb', __dir__)

data/rakelib/gem_version.rake

@@ -1,5 +1,5 @@
-
 require_relative '../lib/trop'
+require_relative '../lib/trop/gem_version'
 
 namespace :gem do
 
@@ -13,7 +13,6 @@ namespace :gem do
   end
 
   task :next do
-
     # self.dirty_tree?
     # Are we in a dirty, dirty tree?
     Trop::Sh::silent!
@@ -29,14 +28,14 @@ namespace :gem do
     else
       vers1 = vers2 = nil
       Trop::Sh::silence_streams(STDOUT) {
-        vers1 = GemVersion.increment_version
-        vers2 = GemHelper.rewrite_gemspec
-        GemVersion.commit_and_push {|g| g.add(Trop::VERSION_FILE) && g.add(Trop::GEMSPEC_NAME)}
+        vers1 = Trop::GemVersion.increment_version
+        vers2 = Trop::GemVersion.rewrite_gemspec
+        Trop::GemVersion.commit_and_push {|g| g.add(Trop::VERSION_FILE) && g.add(Trop::GEMSPEC_NAME)}
       }
 
       puts "incr. version build and push #{vers1} #{vers2}"
-      Trop::Sh::systemlocal('rake build')
-      Trop::Sh::systemlocal('rake release')
+      Trop::Sh::systemlocal('gem build trop.gemspec')
+      Trop::Sh::systemlocal('rake gembox')
     end
   end
 
@@ -46,27 +45,27 @@ namespace :gem do
     FileUtils.cp(%w[LICENSE.txt README.md README.rakes.md TODO.md], 'public', verbose: true)
   end
 
-
-
-end
-
-namespace :gem do
   desc "Clean *.gem* files from project root"
   task :clean do
     FileUtils.rm_f Dir.glob('*.gem*')
   end
 
+  desc "sync version files"
+  task :sync do
+    Trop::GemVersion::update_version(Trop::VERSION)
+  end
+
   desc "Return and set next gem version"
   task :version do
     if (ENV.include?("set"))
       version = ENV['set'].gsub(/'/, '')
-      unless GemVersion.version_format_valid?(version)
+      unless Trop::GemVersion.version_format_valid?(version)
         raise "Version '#{version}' format invalid.  Must only contain digits separated by decimal points."
       end
-      GemVersion.set_version(version)
+      Trop::GemVersion.set_version(version)
       puts "Next version set at '#{version}'"
     else
-      puts GemVersion.next_version
+      puts Trop::GemVersion.next_version
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trop
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.7.0
 platform: ruby
 authors:
 - werner
@@ -10,6 +10,62 @@ bindir: bin
 cert_chain: []
 date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: git-version-bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -95,47 +151,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +272,7 @@ files:
 - lib/trop/core-ext.rb
 - lib/trop/file_finder.rb
 - lib/trop/filefind.rb
-- lib/trop/gem_tasks.rb
+- lib/trop/gem_version.rb
 - lib/trop/infogit.rb
 - lib/trop/os.rb
 - lib/trop/shell_deb_verb.rb

data/lib/trop/gem_tasks.rb

@@ -1,38 +0,0 @@
-require 'bundler'
-require 'bundler/gem_tasks'
-#require 'bundler-geminabox/gem_tasks'
-require 'bundler/endpoint_specification'
-require 'bump'
-require 'gem_version'
-require 'git-version-bump/rake-tasks'
-#require 'gem/release'
-
-module GemHelper
-
-  def self.rewrite_gemspec
-    spec_path = FileUtils.getwd + '/' + Trop::GEMSPEC_NAME
-    spec_gem = Gem::Specification::load(spec_path)
-    spec_gem.version =  GemVersion.next_version
-    File.open(spec_path, 'w') {|f| f.write spec_gem.to_ruby }
-    unless Trop::Sh::silent?
-      File.open("gemspecx.gemspecx", 'w') {|f| f.write spec_gem.to_ruby }
-    end
-
-    return spec_gem.version
-  end
-
-  def self.check_lib_version_rb
-    content = Pathname.new(Trop::VERSION_FILE).read
-    version_ok = content.scan(/VERSION.*["']+\d+\.\d+[\.\d+]+["']+/)
-    version_ok
-  end
-
-  def self.check_lib_version_rb?
-    return false if ( GemHelper::check_lib_version_rb.nil? )
-    true
-  end
-
-  def self.update_version
-  end
-
-end