tagging 0.0.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 563e40a9d49dda41aff47cbd39e4cfa87e767f2f
-  data.tar.gz: dd603db2458c9b6edbd34475560f21d6d6c48c09
+  metadata.gz: 2ece77b05d75ff8933edb236c0ded896bbfbb4f6
+  data.tar.gz: 599c773e9a58e466593b0bc4d64634920e641573
 SHA512:
-  metadata.gz: 122b81fc674f62fd71891e0afba94ff21312c086545b64fd0688720c1630676714c66575ec40787f7579ab03f57b8ab49074a5da0b3e98e6d0d4fa5a3079b7f8
-  data.tar.gz: b9b6632b3d88838ce01d5e540a0c9cdd7d0de3427c555174093e1ebde83750f7fe1736f6a96100bbe2f3e83e035bf118958eb83083456abb30ef947773255e99
+  metadata.gz: ca854995e01c57a4507c0ecb4a1f22d808b91fa4d7e91d27e3ad737c44843daede0253a633bb8e839ccd56e23b87caf4c975309e37d1c93712306d6c6739aa51
+  data.tar.gz: baaa21d142bb6e9a2ae404c1f9f262379ec6eb7f6bac2addcca3ba3b9505d137547f6d1532c01129864c643947bc55da22472bcae236b6e9bcd00b5119d0faeb

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Jeff Patmon
+Copyright (c) 2016 Alther Alves
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,5 +1,7 @@
 # Tagging
 
+[![Gem Version](https://badge.fury.io/rb/tagging.svg)](https://badge.fury.io/rb/tagging)
+
 Automated version management for your Gem builds.
 
 ## Resources
@@ -24,47 +26,30 @@ Never bother updating the version for your next gem build by hand.  Configured i
 
 `bundle exec rake tagging:push`
 
-* Bash
+### Bash
 
 `cd /rails/app/path && git-tagging push`
 
 
-## Adding other files
-
-To add other files to the GemVersion.commit_and_push method use the block.  For instance,
-if you want to commit and push the gemspec file also:
-
-  task :gemspec do
-    File.open("#{spec.name}.gemspec", 'w') do |f|
-      f.write spec.to_ruby
-    end
-    GemVersion.increment_version
-    GemVersion.commit_and_push do |git|
-      git.add("#{spec.name}.gemspec")
-    end
-  end
-
-## Bumping or resetting the next gem version
-
-GemVersion creates a file named 'next_gem_version' in the root directory of your project which contains the 'next' gem version.  Edit the version in this file or use the rake tasks to bump or set the version for the next build.
+* It's necessary that your server have ssh permission. Seting a git user
 
-GemVersion increments the last component of your version.  If you need to bump from 0.1.x to 0.2.x, you'll need to bump the version manually.
+`git-tagging push --config user.email para.alves@gmail.com user.name "Altherlex Alves"`
 
-## Rake tasks
 
-Two rake tasks gem:clean and gem:version are available whenever you require gem_version.
+* Load remote tags
 
-* Clean the project root of .gem and .gemspec files.
+`git-tagging --version -f`
 
-  rake gem:clean
 
-* Get the next gem version
+### AWS OpsWorkers + CircleCI
 
-  rake gem:version
-
-* Set the next gem version
-
-  rake gem:version set=0.1.0
+```
+  production:
+    branch: master
+    commands:
+      - git-tagging --push
+      - dpl --provider=opsworks --access-key-id=$AWS_ACCESS_KEY_ID --secret-access-key="$AWS_SECRET_ACCESS_KEY" --app-id=$AWS_APP_ID --wait-until-deployed --custom_json='{"deploy":{"my_app":{"scm":{"revision":"tags/$(git-tagging --version)" }}}}' --skip_cleanup
+```
 
 
 ## Dependencies

data/bin/git-tagging

@@ -3,20 +3,24 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'optparse'
 require 'tagging/app_version'
-require 'tagging/gem_version'
 
 module Tagging
   class CLI
 
     def self.run(options)
+      app_version = Tagging::AppVersion.new(options)
+
       if options[:push]
-        puts Tagging::AppVersion.increment_and_push rescue exit 1
+        puts app_version.increment_and_push
         exit 0
       elsif options[:version]
-        puts Tagging::AppVersion.version rescue exit 1
+        puts app_version.version
         exit 0
       elsif options[:next_version]
-        puts Tagging::AppVersion.increment_version rescue exit 1
+        puts app_version.increment_version
+        exit 0
+      elsif options[:load_tags]
+        puts app_version.load_tags
         exit 0
       else
         puts "## [message] Run `tagging --help' for more options."
@@ -33,26 +37,55 @@ module Tagging
 end
 
 options = {}
-opt_parser = OptionParser.new do |opt|
-  opt.banner = "Usage: tagging [OPTIONS]"
-  opt.separator  ""
-  opt.separator  "Options"
 
-  opt.on("-p","--push","Increment version and push to tag") do |value|
-    options[:push] = value
-  end
-
-  opt.on("-v","--version","Show current version into rails app path") do |value|
-    options[:version] = value
-  end
+if ARGV.first == 'push'
+  options[:push] = true
   
-  opt.on("-n","--next_version","Show the next version") do |value|
-    options[:next_version] = value
-  end
+  opt_parser = OptionParser.new do |opt|
+    opt.banner = "Usage: git-tagging push [OPTIONS]"
+    opt.separator  ""
+    opt.separator  "Options"
+
+    # git config --global 
+    opt.on("--config [variables]", "user.email \"you@example.com\" and user.name \"Name\". Like `git config --global`", String) do |value|
+      options[:config] = Hash[*ARGV]
+    end
+
+    opt.on("-m", "Tag message", String) do |message|
+      options[:message] = message
+    end
 
-  opt.on("-h","--help","help") do
-    puts opt_parser
-    exit
+    opt.on_tail("-h","--help","help push command") do
+      puts opt_parser
+      exit
+    end
+  end  
+else
+  opt_parser = OptionParser.new do |opt|
+    opt.banner = "Usage: git-tagging [OPTIONS]"
+    opt.separator  ""
+    opt.separator  "Options"
+
+    # opt.on("-p","--push","Increment version and push to tag") do |value|
+    #   options[:push] = value
+    # end
+
+    opt.on("-v","--version","Show current version into rails app path") do |value|
+      options[:version] = value
+    end
+    
+    opt.on("-n","--next-version","Show the next version") do |value|
+      options[:next_version] = value
+    end
+
+    opt.on("-f","--fetch-tags","Load remote tags") do
+      options[:load_tags] = true
+    end
+
+    opt.on_tail("-h","--help","help") do
+      puts opt_parser
+      exit
+    end
   end
 end
 opt_parser.parse!

data/lib/tagging/app_version.rb

@@ -3,16 +3,25 @@ require 'logger'
 
 module Tagging
   class AppVersion
-    @@default_commit_message = 'versioning by CI'
-    @@version
 
-    def self.version
-      @@version ||= `git -C #{Dir.pwd} describe --tags $(git -C #{Dir.pwd} for-each-ref refs/tags --sort=-taggerdate --format='%(objectname)' --count=1)`.chomp
-      @@version = self.init_version_file unless self.version_format_valid?(@@version)
-      @@version
+    def initialize(options={})
+      @options = {message:'versioning by CI'}.merge(options)
+      @git = nil
     end
 
-    def self.version_format_valid?(v)
+    def version
+      load_tags if @options[:load_tags]
+      @options[:current_version] ||= `git -C #{Dir.pwd} describe --tags $(git -C #{Dir.pwd} for-each-ref refs/tags --sort=-taggerdate --format='%(objectname)' --count=1)`.chomp
+      @options[:current_version] = self.class.init_version_file unless self.class.version_format_valid?(@options[:current_version])
+      @options[:current_version]
+    end
+
+    def load_tags
+      puts "git -C #{Dir.pwd} fetch --tags" 
+      `git -C #{Dir.pwd} fetch --tags`
+    end
+
+    def self.version_format_valid?(v='')
       (v && v =~ /^v\d+\.\d+\.\d+-[\.\d+]+$/)
     end
 
@@ -20,19 +29,31 @@ module Tagging
       initial_version = 'v0.0.1-00'
     end
 
-    def self.increment_and_push
-      self.increment_version
-      self.commit_and_push
+    def increment_and_push
+      load_tags
+      increment_version
+      commit_and_push
     end
 
-    def self.increment_version
-      @@version = self.version.next
+    def increment_version
+      @options[:current_version] = self.version.next
     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_tag(self.version, nil, message: @@default_commit_message)
-      g.push('origin', "refs/tags/#{self.version}", f: true)
+    def set_global_config
+      if @options[:config]
+        @options[:config].each do |key, value|
+          @git.config(key, value)
+        end
+      end
+    end
+
+    def commit_and_push(project_directory=Dir.pwd)
+      @git = Git.open(project_directory, :log=>Logger.new(STDOUT))
+      
+      set_global_config
+
+      @git.add_tag(self.version, nil, message: @options[:message])
+      @git.push('origin', "refs/tags/#{self.version}")
     end
   end
 end

data/lib/tagging/version.rb

@@ -1,3 +1,3 @@
 module Tagging
-  VERSION = '0.0.3'
+  VERSION = '0.2.0'
 end

data/lib/tagging.rb

@@ -2,4 +2,3 @@ require 'rubygems'
 require 'git'
 require 'logger'
 require 'tagging/app_version'
-require 'tagging/gem_version'

data/tagging.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.authors               = ["Alther Alves"]
   s.email                 = ["para.alves@gmail.com"]
-  s.date                  = "2016-04-21"
-  s.homepage              = "http://github.com/altherlex/gem_version/tree/master"
+  s.date                  = "2016-04-27"
+  s.homepage              = 'https://github.com/altherlex/tagging'
   s.summary               = %q{Never bother updating the version for your next gem build by hand.  Configured in your Rakefile, gem_version provides the next Gem version and stores it to the repository.}
   s.description           = %q{Automated version management for your Gem and RailsApp builds}
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tagging
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Alther Alves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -80,18 +80,15 @@ files:
 - README.md
 - Rakefile
 - bin/git-tagging
-- lib/gem_version.rb
 - lib/tagging.rb
 - lib/tagging/app_version.rb
-- lib/tagging/gem_version.rb
 - lib/tagging/tasks/app_version.rake
-- lib/tagging/tasks/gem_version.rake
 - lib/tagging/version.rb
 - spec/gem_version_spec.rb
 - spec/next_gem_version
 - spec/spec.opts
 - tagging.gemspec
-homepage: http://github.com/altherlex/gem_version/tree/master
+homepage: https://github.com/altherlex/tagging
 licenses:
 - MIT
 metadata: {}

data/lib/gem_version.rb

@@ -1,67 +0,0 @@
-require 'rubygems'
-require 'git'
-require 'logger'
-
-load File.dirname(__FILE__) + '/tasks/gem_version.rake'
-
-
-module 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)
-    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.increment_version
-    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('.')
-    update_version(new_version)
-    version
-  end
-
-  def self.update_version(new_version)
-    file = File.new(@@gem_version_file, 'w')
-    file.puts new_version
-    file.close    
-  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/tagging/gem_version.rb

@@ -1,62 +0,0 @@
-module Tagging
-  class 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)
-      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.increment_version
-      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('.')
-      update_version(new_version)
-      version
-    end
-
-    def self.update_version(new_version)
-      file = File.new(@@gem_version_file, 'w')
-      file.puts new_version
-      file.close    
-    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
-end

data/lib/tagging/tasks/gem_version.rake

@@ -1,24 +0,0 @@
-namespace :tagging do
-  namespace :gem do
-    desc "Clean *.gem* files from project root"
-    task :clean do
-      FileUtils.rm_f Dir.glob('*.gem*')
-      exit 0
-    end
-
-    desc "Return and set next gem version"
-    task :version do
-      if (ENV.include?("set"))
-        version = ENV['set'].gsub(/'/, '')
-        unless Tagging::GemVersion.version_format_valid?(version)
-          raise "Version '#{version}' format invalid.  Must only contain digits separated by decimal points."
-        end
-        Tagging::GemVersion.set_version(version)
-        puts "Next version set at '#{version}'"
-      else
-        puts Tagging::GemVersion.next_version
-      end
-      exit 0
-    end
-  end
-end