trop 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9268ce6ded40e0a1527ed34e01569bac1b0874ccaf7a6ce4f4670751191dc2c
-  data.tar.gz: 37f623a7ea3c96309055b9c225a278366774faba0c7900b99a249db7fe31cc8a
+  metadata.gz: d8a4aff04bf2e45be6a1b47fc939f02d3725149f9f73d6b3779ab3f4f4a6b8bd
+  data.tar.gz: 33105a3554b27407a465c37fb03ff1f29685206af0def7f01a9f20c0c1beff21
 SHA512:
-  metadata.gz: 232abbcda82bd01233bf116702c966e885ad5a85541268bd51a99d4458a664f19bb5d480616330f68b07af193112a200b14275bcd12db43c2a8defcfc7e2d372
-  data.tar.gz: 937480adab0e4f6db433a1152f179545697222b05ddf70c62d3728540ec1beb6b1e4cf3cee259ec71fd827fe21b4094dc351aa75f5af197702210d47a0321afe
+  metadata.gz: 64f1fa46f99ca2361a2afad361c099c86e4bbc16dd33c3cc7f179235dabe35e74ebd39dea9b79b3e5d9d02b519e43b17641299d7e646f7af57c106a6659f4471
+  data.tar.gz: d66bf235a374b54656671cd13fe89105a3cdd34eb987b89a4d192aae7d1be37722fa1d3250156fcb91552e5917335bc7324198ba49181efaf0a933df41fa14d0

data/Gemfile

@@ -10,3 +10,5 @@ gemspec
 group :development do
 
 end
+
+gem "yard", "~> 0.9.19"

data/Rakefile

@@ -2,8 +2,13 @@ require 'rubygems'
 require 'rake'
 require 'bump'
 require 'fileutils'
-require 'git-version-bump/rake-tasks'
-require "bundler/gem_tasks"
+
+require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'bump/tasks'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.1

data/lib/trop/file_finder.rb

@@ -68,6 +68,25 @@ module Trop
       return files
     end
 
+    def collect_gem_tree(path)
+      files = []
+      if path.is_a? Array
+        path.each {|s| files += fffind(s) }
+      else
+        files += fffind(path)
+      end
+
+      out=[]
+      files.each do |f|
+        f = f.delete_prefix('/home/werner/rails/trop/')
+        next unless f.to_s.end_with?('.rb')
+
+        out << f
+      end
+
+
+      return out
+    end
     # @param spath to search in
     def collect_sorted_readme(spath)
       @readmes = []
@@ -147,6 +166,11 @@ module Trop
       finder.collect_dir_tree(path)
     end
 
+    def self.my_gemspec_fffind(*path)
+      finder = FileFinder.new
+      finder.collect_gem_tree(*path)
+    end
+
   end
 end
 

data/lib/trop/gem_version.rb

@@ -1,10 +1,15 @@
 require 'rubygems'
 require 'git'
 require 'logger'
+require_relative 'version'
 
 #load File.dirname(__FILE__) + '/../../rakelib/gem_version.rake'
 
+
+
+
 module Trop::GemVersion
+  @@version = nil
   @@gem_version_file = 'next_gem_version'
   @@default_commit_message = 'incremented gem version'
 
@@ -40,64 +45,91 @@ module Trop::GemVersion
     self.update_version(self.increment_version)
     self.rewrite_gemspec
     self.commit_and_push
+    self.version
   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
+    @@version = components.join('.')
+    ENV['VERSION'] = @@version
+    @@version
   end
 
   def self.rewrite_gemspec
-    spec_path = FileUtils.getwd + '/' + Trop::GEMSPEC_NAME
+    spec_path = FileUtils.getwd + '/' + self.gemspec_name
     spec_gem = Gem::Specification::load(spec_path)
-    spec_gem.version = Trop::GemVersion.next_version
+    spec_gem.version = @@version || self.next_version
+    spec_gem.files = spec_gem.files + Trop::FileFinder::my_gemspec_fffind([File.expand_path('./lib'),File.expand_path('rakelib')])
     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?)
+    return false if (self.check_lib_version_rb.nil?)
     true
   end
 
   def self.check_lib_version_rb
-    content = Pathname.new(Trop::VERSION_FILE).read
+	  content = Pathname.new(self.version_file_rb).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
-
+  def self.update_lib_version_rb(version)
+    unless self.check_lib_version_rb?
+      puts "version out of sync"
+      assert false
       return
     end
-
-    puts "version out of sync"
-    assert false
+      # update
+    content = Pathname.new(self.version_file_rb).read
+    File.open(self.version_file_rb + '.tmp', 'w') do |out|
+      content.each_line do |l|
+        ret = l.match(/VERSION.*["']+\d+\.\d+[\.\d+]+["']+/)
+        if ret
+          out.print "  VERSION = '" + version + "'\n"
+        else
+          out.print (l)
+        end
+      end
+    end
+    # rename
+    FileUtils.cp( self.version_file_rb + '.tmp',self.version_file_rb, preserve: false)
   end
 
-
   def self.update_version(new_version)
+    # 0. ENV
+    @@version = new_version
+    ENV['VERSION'] = @@version
     # 1. next_version
     file = File.new(@@gem_version_file, 'w')
-    file.print new_version
+    file.print new_version + "\n"
     file.close
     # 2. VERSION
     file = File.new('VERSION', 'w')
-    file.print new_version
+    file.print new_version + "\n"
     file.close
     # 3.
+    self.update_lib_version_rb(@@version)
+    # 4. gemspec
+    self.rewrite_gemspec
+    ENV['VERSION'] = @@version
   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)
+    g.add(self.version_file_rb)
+    g.add(self.gemspec_name)
+    g.add('VERSION')
     yield(g) if block_given?
     g.commit(msg || @@default_commit_message)
+    v = @@version
+    system("git tag -f -a -m 'Version v#{v}' v#{v}")
+    system("git push > #{DEVNULL} 2>&1")
+    system("git push --tags > #{DEVNULL} 2>&1")
     g.push
   end
 end

data/lib/trop/version.rb

@@ -1,6 +1,24 @@
 module Trop
-  VERSION = '0.7.0'
+  VERSION = '0.8.1'
   VERSION_NAME = 'trop'
-  GEMSPEC_NAME = VERSION_NAME + '.gemspec'
-  VERSION_FILE = File.expand_path('version.rb', __dir__)
+end
+
+module Trop::GemVersion
+
+  def self.version_name
+    Trop::VERSION_NAME
+  end
+
+  def self.version
+    Trop::VERSION
+  end
+
+  def self.version_file_rb
+    File.expand_path('version.rb', __dir__)
+  end
+
+  def self.gemspec_name
+    Trop::VERSION_NAME + '.gemspec'
+  end
+  
 end

data/lib/trop.rb

@@ -0,0 +1,10 @@
+require_relative './trop/version'
+require_relative './trop/core-ext'
+require_relative './trop/os'
+require_relative './trop/shell_deb_verb'
+require_relative './trop/infogit'
+require_relative './trop/gem_version'
+require 'colorized_string'
+
+require_relative './trop/filefind'
+require_relative './trop/file_finder'

data/rakelib/gem_version.rake

@@ -1,5 +1,5 @@
 require_relative '../lib/trop'
-require_relative '../lib/trop/gem_version'
+
 
 namespace :gem do
 
@@ -35,7 +35,7 @@ namespace :gem do
 
       puts "incr. version build and push #{vers1} #{vers2}"
       Trop::Sh::systemlocal('gem build trop.gemspec')
-      Trop::Sh::systemlocal('rake gembox')
+      #Trop::Sh::systemlocal('rake gembox')
     end
   end
 
@@ -52,7 +52,7 @@ namespace :gem do
 
   desc "sync version files"
   task :sync do
-    Trop::GemVersion::update_version(Trop::VERSION)
+    Trop::GemVersion::update_version(Trop::GemVersion::next_version)
   end
 
   desc "Return and set next gem version"

data/rakelib/raven.rake

@@ -10,7 +10,7 @@ if ENV['CI'].nil?
     config.dsn = envtest
     config.release = Trop::InfoGit::GitProject.commit_id
     config.ssl_verification = false
-     puts "Using dsn #{envtest}".yellow #if Shell.verbose?
+    puts "Using dsn #{envtest}".yellow if Trop::Sh::verbose?
     # puts "with comit-id: #{InfoGit::GitProject.commit_id}".yellow if Shell.verbose?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trop
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - werner
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !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
@@ -224,16 +210,16 @@ dependencies:
   name: git-up
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +254,7 @@ files:
 - VERSION
 - bin/setup
 - bin/update
+- lib/trop.rb
 - lib/trop/config.bundler.tpl
 - lib/trop/core-ext.rb
 - lib/trop/file_finder.rb
@@ -301,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: trop is troppuS