rgitflow 0.2.0.pre.alpha.pre.21 → 0.2.0.pre.alpha.pre.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTI5OTVjNzgyZmUwMWI4N2IyYjFhZWY1Njg3YTMwYjNlYTBmODFmNw==
+    N2RhM2RjMjM0MDY1MjNhOTNkYmY1ZWYzYzhiN2U2MTlhOTYxZmQ5MQ==
   data.tar.gz: !binary |-
-    NzdiNjA5NjlhYTMxNTNhZDdiNDNlNjBiZTFkM2Q1NDdlZGQ2ODNkYg==
+    NmU2MGJjNmIwZGQwYzg1Nzg2NGRjMmE4YWExN2ZkMmRiZTRjOGJjNw==
 SHA512:
   metadata.gz: !binary |-
-    YmE1NTM0Y2ZlNmE4OWExNWM0YTYyMDg3NTM3NjVkM2FiMGE2NmUxNzFjNWQ2
-    ZDM2YWE1ZGI3ZTIzOWIyNTY0NmQwYzJlMDJlODRjYWUzZWJhMGUzNWM2NDRh
-    MGQ1MmYwZWNhNWU3NjJiNjgzNWQ0N2U1MmM2NWY1OWU1NmVjNTU=
+    YmMzOWFjNmQ2YzI5ZDE3Mjk0YmQxZmViOWZiYTM2MGIxOGEzN2E5MzIxNWEz
+    YmExYzYxYmNlY2Y0ZWFkMDM0YjRkYjhmZjE2ZWRhOWRmMjhmNDUwN2Y1MmFh
+    MmJiYzUxZDJjMDI5M2JjZWM0ZmJiNzBiNGRiNjkyMzNiMGY2NmQ=
   data.tar.gz: !binary |-
-    ODQzNDQ0N2RiMzRjMzgzZmVmMjYyYTliMWVkZGFjYWQ0YmFhNzU4MmFmMjZl
-    NmQ0OGFkMGY0YjZhYmQ1NzM0NDQzZWRkMjk2M2QxYTE5MjA5MjE3OTBlOGQy
-    MTlhZWE1MTliNDE0NDBkYTdmMWIzZDhjZTkyOWQxNmFhMTFlMGU=
+    OTViZTg1OTU1YzIzZWI2NjIzMmM5MmMzOWU1MTkyMTg5MzA4NmU1MTk3NWVm
+    ZmRlNTAxYzk0MzgwMTUxNjE3ZjRiMWI4MjY5OGRjMDJkZTVlZWM5YzMwNzYz
+    Zjk4ZDdhZGRhYTI1NDJiMGQxYTRhOGI2ODhjYzYyOGNiZTVmZTc=

data/lib/rgitflow/config.rb

@@ -13,7 +13,8 @@ module RGitFlow
         :develop => 'develop',
         :feature => 'feature',
         :hotfix => 'hotfix',
-        :release => 'release'
+        :release => 'release',
+        :tag => 'v%s'
     }
 
     def self.load

data/lib/rgitflow/git_ext/lib.rb

@@ -13,13 +13,4 @@ Git::Lib.class_eval do
     command('push', arr_opts + [branch])
     command('push', ['--tags'] + arr_opts) if opts[:tags]
   end
-
-  def diff_shortstat(obj1 = 'HEAD', obj2 = nil, opts = {})
-    diff_opts = ['--shortstat']
-    diff_opts << obj1
-    diff_opts << obj2 if obj2.is_a?(String)
-    diff_opts << '--' << opts[:path_limiter] if opts[:path_limiter].is_a? String
-
-    command('diff', diff_opts)
-  end
 end

data/lib/rgitflow/install.rb

@@ -21,17 +21,17 @@ module RGitFlow
     end
 
     def install
-      require 'rgitflow/tasks/scm/status'
-      RGitFlow::Tasks::SCM::Status.new @git
+      require 'rgitflow/tasks/scm/tasks'
+      RGitFlow::Tasks::SCM.install_tasks :git => @git
 
       require 'rgitflow/tasks/feature/tasks'
-      RGitFlow::Tasks::Feature.install_tasks({:git => @git})
+      RGitFlow::Tasks::Feature.install_tasks :git => @git
 
       require 'rgitflow/tasks/hotfix/tasks'
-      RGitFlow::Tasks::Hotfix.install_tasks({:git => @git})
+      RGitFlow::Tasks::Hotfix.install_tasks :git => @git
 
       require 'rgitflow/tasks/release/tasks'
-      RGitFlow::Tasks::Release.install_tasks({:git => @git})
+      RGitFlow::Tasks::Release.install_tasks :git => @git
     end
   end
 end

data/lib/rgitflow/tasks/feature/tasks.rb

@@ -15,7 +15,7 @@ module RGitFlow
       attr_reader :git
 
       def initialize(git = nil)
-        @git = git || Git.open(Pathname.pwd)
+        @git = git || Git.open(Dir.pwd)
       end
 
       def install

data/lib/rgitflow/tasks/hotfix/tasks.rb

@@ -15,7 +15,7 @@ module RGitFlow
       attr_reader :git
 
       def initialize(git = nil)
-        @git = git || Git.open(Pathname.pwd)
+        @git = git || Git.open(Dir.pwd)
       end
 
       def install

data/lib/rgitflow/tasks/release/finish.rb

@@ -5,7 +5,8 @@ module RGitFlow
     class Release
       class Finish < RGitFlow::Tasks::Task
         def initialize(git)
-          super(git, 'finish', 'Finish a release branch', ['rgitflow', 'release'])
+          super(git, 'finish', 'Finish a release branch',
+                ['rgitflow', 'release'], ['install'])
         end
 
         protected
@@ -16,16 +17,22 @@ module RGitFlow
           branch = @git.current_branch
 
           unless branch.start_with? RGitFlow::Config.options[:release]
-            error 'Cannot finish a release branch unless you are in a release branch'
+            error %Q(Cannot finish a release branch unless you are in a release
+                     branch)
             abort
           end
 
+          msg = %Q(merging #{branch} into #{RGitFlow::Config.options[:master]})
+
           @git.branch(RGitFlow::Config.options[:master]).checkout
-          @git.merge branch, "merging #{branch} into #{RGitFlow::Config.options[:master]}"
+          @git.merge branch, msg
+
+          invoke 'rgitflow:scm:tag'
 
           @git.push
+          # force re-creation of develop branch
           if @git.is_remote_branch? branch
-            @git.push('origin', branch, {:delete => true})
+            @git.push('origin', branch, { :delete => true })
           end
 
           @git.branch(branch).delete

data/lib/rgitflow/tasks/release/tasks.rb

@@ -15,7 +15,7 @@ module RGitFlow
       attr_reader :git
 
       def initialize(git = nil)
-        @git = git || Git.open(Pathname.pwd)
+        @git = git || Git.open(Dir.pwd)
       end
 
       def install

data/lib/rgitflow/tasks/scm/status.rb

@@ -2,7 +2,7 @@ require 'rgitflow/tasks/task'
 
 module RGitFlow
   module Tasks
-    module SCM
+    class SCM
       class Status < RGitFlow::Tasks::Task
         def initialize(git)
           super(git, 'status', 'Check the status of the repository', ['rgitflow', 'scm'])
@@ -23,7 +23,7 @@ module RGitFlow
         end
 
         def dirty?
-          @git.dirty?
+          @git.diff.size > 0
         end
 
         def print_status

data/lib/rgitflow/tasks/scm/tag.rb

@@ -0,0 +1,75 @@
+require 'rgitflow/tasks/task'
+
+module RGitFlow
+  module Tasks
+    class SCM
+      class Tag < RGitFlow::Tasks::Task
+        def initialize(git)
+          super(git, 'tag', 'Tags the repository',
+                ['rgitflow', 'scm'])
+        end
+
+        protected
+
+        def run
+          status 'Creating tag...'
+          if dirty?
+            error 'There are uncommitted changes in the repository!'
+
+            print_status
+
+            abort
+          else
+            status 'There are no uncommitted changes in the repository.'
+          end
+          tag = ENV['TAG'] || ("#{RGitFlow::Config.options[:tag]}" %
+              RGitFlow::VERSION.to_s)
+          unless @git.tags.select { |t| t.name == tag }.length == 0
+            error 'Cannot create a tag that already exists!'
+            abort
+          end
+          @git.add_tag tag, { :m => "tagging as #{tag}" }
+
+          @git.push 'origin', @git.current_branch, { :tags => true }
+
+          status 'Successfully created tag!'
+        end
+
+        def dirty?
+          @git.dirty?
+        end
+
+        def print_status
+          added    = []
+          modified = []
+          deleted  = []
+
+          @git.diff.each { |f|
+            if f.type == 'new'
+              added << f
+            elsif f.type == 'modified'
+              modified << f
+            elsif f.type == 'deleted'
+              deleted << f
+            end
+          }
+
+          debug 'added'
+          msg = %Q(#{ANSI::Constants::GREEN}#{ANSI::Constants::BRIGHT}
+          #{f.path}#{ANSI::Constants::CLEAR})
+          added.each { |f| debug "  #{msg}" }
+
+          debug 'modified'
+          msg = %Q(#{ANSI::Constants::YELLOW}#{ANSI::Constants::BRIGHT}
+          #{f.path}#{ANSI::Constants::CLEAR})
+          modified.each { |f| debug "  #{msg}" }
+
+          debug 'deleted'
+          msg = %Q(#{ANSI::Constants::RED}#{ANSI::Constants::BRIGHT}
+          #{f.path}#{ANSI::Constants::CLEAR})
+          deleted.each { |f| debug "  #{msg}" }
+        end
+      end
+    end
+  end
+end

data/lib/rgitflow/tasks/scm/tasks.rb

@@ -0,0 +1,27 @@
+module RGitFlow
+  module Tasks
+    class SCM
+      autoload :Status, 'rgitflow/tasks/scm/status'
+      autoload :Tag, 'rgitflow/tasks/scm/tag'
+
+      class << self
+        attr_accessor :instance
+
+        def install_tasks(opts = {})
+          new(opts[:git]).install
+        end
+      end
+
+      attr_reader :git
+
+      def initialize(git = nil)
+        @git = git || Git.open(Dir.pwd)
+      end
+
+      def install
+        Status.new @git
+        Tag.new @git
+      end
+    end
+  end
+end

data/lib/rgitflow/tasks/task.rb

@@ -1,5 +1,3 @@
-require 'rgitflow/printing'
-
 require 'rake'
 require 'rake/tasklib'
 
@@ -7,6 +5,7 @@ module RGitFlow
   module Tasks
     class Task < ::Rake::TaskLib
       include RGitFlow::Printing
+      include RGitFlow::Console
       # The namespaces of the task
       # @return [Array<String>] the task namespaces
       attr_accessor :namespaces
@@ -19,6 +18,10 @@ module RGitFlow
       # @return [String] the task description
       attr_accessor :description
 
+      # The dependencies of the task
+      # @return [Array<String>] the dependencies of the task
+      attr_accessor :dependencies
+
       # Runs a +Proc+ before the task
       # @return [Proc] a proc to call before running the task
       attr_accessor :before
@@ -27,11 +30,13 @@ module RGitFlow
       # @return [Proc] a proc to call after running the task
       attr_accessor :after
 
-      def initialize(git, name, description, namespaces = ['rgitflow'])
+      def initialize(git, name, description, namespaces = ['rgitflow'],
+                     dependencies = [])
         @git = git
         @name = name
         @description = description
         @namespaces = namespaces
+        @dependencies = dependencies
 
         yield self if block_given?
 
@@ -41,8 +46,10 @@ module RGitFlow
       protected
 
       def define
+        full_name = [*@namespaces, @name].join(":")
+
         desc @description unless ::Rake.application.last_comment
-        task([*@namespaces, @name].join(":")) do
+        task full_name => @dependencies do
           before.call if before.is_a?(Proc)
           run
           after.call if after.is_a?(Proc)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgitflow
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.alpha.pre.21
+  version: 0.2.0.pre.alpha.pre.22
 platform: ruby
 authors:
 - Richard Harrah
@@ -152,8 +152,6 @@ files:
 - lib/rgitflow/console.rb
 - lib/rgitflow/core_ext/object.rb
 - lib/rgitflow/core_ext/symbol_hash.rb
-- lib/rgitflow/git_ext/base.rb
-- lib/rgitflow/git_ext/diff.rb
 - lib/rgitflow/git_ext/lib.rb
 - lib/rgitflow/install.rb
 - lib/rgitflow/printing.rb
@@ -167,6 +165,8 @@ files:
 - lib/rgitflow/tasks/release/start.rb
 - lib/rgitflow/tasks/release/tasks.rb
 - lib/rgitflow/tasks/scm/status.rb
+- lib/rgitflow/tasks/scm/tag.rb
+- lib/rgitflow/tasks/scm/tasks.rb
 - lib/rgitflow/tasks/task.rb
 - lib/rgitflow/version.rb
 - rgitflow.gemspec

data/lib/rgitflow/git_ext/base.rb

@@ -1,9 +0,0 @@
-require 'git/base'
-
-Git::Base.class_eval do
-  def dirty?
-    puts '0 files changed, 0 insertions(+), 0 deletions(-)'
-    puts diff.diff_shortstat.to_s.strip
-    '0 files changed, 0 insertions(+), 0 deletions(-)' != diff.diff_shortstat.to_s.strip
-  end
-end

data/lib/rgitflow/git_ext/diff.rb

@@ -1,11 +0,0 @@
-require 'git/diff'
-
-Git::Diff.class_eval do
-
-  def diff_shortstat
-    unless @cached_shortstat
-      @cached_shortstat = @base.lib.diff_shortstat(@from, @to, {:path_limiter => @path})
-    end
-  end
-
-end