rgitflow 0.2.1.pre.alpha.pre.32 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTJkOGFiZjVhNmM1ODE4ZWYxNzY1MjkxYTM3ZTM1NWQ2YmExZjhiNQ==
+    OTAwYTU2NmNhNDAxMmI3ZTA0NzgxYWY5Y2Y3MjYxZWIxMTc4NzYyNQ==
   data.tar.gz: !binary |-
-    NDc3NjQxYzJjNDAyYjg3MjBmYjdmNGJlNzAzZmQzMDUyMGRkOGM2MQ==
+    Njg5Y2NjN2I5ODU2NDA1MTZlYjUwM2FmODI5YTFhNzVkZThmYTMxNw==
 SHA512:
   metadata.gz: !binary |-
-    NzNmNzlmODFjNTFhOGQ3OTNmOGZlZjUyNDg0NWM2ODEwNTc2NzRiNjFhMzVl
-    ZjY2ZDg4ZWRhY2M3ZTcyYTc5ZDk0OTJkZDNiYWM5ZDBlZjNmNjZkZDE5Yzlj
-    ODA2ZmJiMDAwYjVmZjU0MWRmZTA0ZWQyZDE0ZmU2ZDYzNWIxYmQ=
+    OWFjNGVlY2ExM2UyOGIxYWU3ZThiYzIxZDY4MDJlMTNkYmQyZWI0YTI5ODI3
+    YzEyZGQ5NTEwYjEyNDExOTM0MGI5ZDZmYWE5Y2JkMDY1OTFhYzAyYzE3NzJj
+    ZTJlM2M3ODk0MWM3ODI2MmYzYWEyYWUzMTM5NmQwZTg2YmU4MTE=
   data.tar.gz: !binary |-
-    MzM2OTY4OGZlN2MzMTE1NWJmNDY3ZmNhNDUwODhiM2E3ZjE2ZGU1ZGM5NGVj
-    ZDMwMzI2MmNmMWNiNzRjYWZkNzIyNzE1Mjc4N2FhZGZlMmVjYjA2NTJmOGI2
-    ZDMwNjZjNGI5MDI5NjU4NDA2MzY0NWI1NTkxNzQ3YzQzYmM4YTA=
+    MzVhMzY5YzZkYWIzYzQyODdmYzMxNzUzNTk3NmFlNTQyYmZjNGNmMmNkZjVk
+    MzJkZWJhZTQ2ZmU5MjkwMmMxNDE3MmIzYjI3ZDUwNWJiODRjZTlhMDRlN2Mw
+    ZjA0ZGNlMjY3Nzg0NmQyMDExY2Y2MGU3MDVjODhkYjI1NDQ1OGU=

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

@@ -20,12 +20,20 @@ module RGitFlow
             abort
           end
 
+          msg = %Q("merging #{branch} into #{RGitFlow::Config.options[:develop]}")
+
           @git.branch(RGitFlow::Config.options[:develop]).checkout
-          @git.merge branch, "merging #{branch} into #{RGitFlow::Config.options[:develop]}"
+          @git.merge branch
+
+          begin
+            @git.commit_all msg
+          rescue
+            status 'develop branch is up-to-date'
+          end
 
           @git.push
           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/hotfix/finish.rb

@@ -20,12 +20,21 @@ module RGitFlow
             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
+
+          begin
+            @git.commit_all msg
+          rescue
+            status 'master branch is up-to-date'
+          end
 
           @git.push
           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/finish.rb

@@ -22,10 +22,29 @@ module RGitFlow
             abort
           end
 
+          msg = %Q(merging #{branch} into #{RGitFlow::Config.options[:develop]})
+
+          @git.branch(RGitFlow::Config.options[:develop]).checkout
+          @git.merge branch
+
+          begin
+            @git.commit_all msg
+          rescue
+            status 'develop branch is up-to-date'
+          end
+
+          @git.push
+
           msg = %Q(merging #{branch} into #{RGitFlow::Config.options[:master]})
 
           @git.branch(RGitFlow::Config.options[:master]).checkout
-          @git.merge branch, msg
+          @git.merge branch
+
+          begin
+            @git.commit_all msg
+          rescue
+            status 'master branch is up-to-date'
+          end
 
           invoke 'rgitflow:scm:tag'
 

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

@@ -1,11 +1,11 @@
-require 'rgitflow/tasks/task'
+require 'rgitflow/tasks/scm/task'
 
 module RGitFlow
   module Tasks
     class SCM
-      class Status < RGitFlow::Tasks::Task
+      class Status < RGitFlow::Tasks::SCM::Task
         def initialize(git)
-          super(git, 'status', 'Check the status of the repository', ['rgitflow', 'scm'])
+          super(git, 'status', 'Check the status of the repository')
         end
 
         protected
@@ -17,38 +17,8 @@ module RGitFlow
             print_status
 
             abort
-          else
-            status 'There are no uncommitted changes in the repository.'
           end
-        end
-
-        def dirty?
-          @git.diff.size > 0
-        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'
-          added.each { |f| debug "  #{ANSI::Constants::GREEN}#{ANSI::Constants::BRIGHT}#{f.path}#{ANSI::Constants::CLEAR}" }
-
-          debug 'modified'
-          modified.each { |f| debug "  #{ANSI::Constants::YELLOW}#{ANSI::Constants::BRIGHT}#{f.path}#{ANSI::Constants::CLEAR}" }
-
-          debug 'deleted'
-          deleted.each { |f| debug "  #{ANSI::Constants::RED}#{ANSI::Constants::BRIGHT}#{f.path}#{ANSI::Constants::CLEAR}" }
+          status 'There are no uncommitted changes in the repository.'
         end
       end
     end

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

@@ -1,12 +1,11 @@
-require 'rgitflow/tasks/task'
+require 'rgitflow/tasks/scm/task'
 
 module RGitFlow
   module Tasks
     class SCM
-      class Tag < RGitFlow::Tasks::Task
+      class Tag < RGitFlow::Tasks::SCM::Task
         def initialize(git)
-          super(git, 'tag', 'Tags the repository',
-                ['rgitflow', 'scm'])
+          super(git, 'tag', 'Tags the repository')
         end
 
         protected
@@ -19,9 +18,8 @@ module RGitFlow
             print_status
 
             abort
-          else
-            status 'There are no uncommitted changes in the repository.'
           end
+          status 'There are no uncommitted changes in the repository.'
           tag = ENV['TAG'] || ("#{RGitFlow::Config.options[:tag]}" %
               RGitFlow::VERSION.to_s)
           unless @git.tags.select { |t| t.name == tag }.length == 0
@@ -34,41 +32,6 @@ module RGitFlow
 
           status 'Successfully created tag!'
         end
-
-        def dirty?
-          @git.diff.size > 0
-        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

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

@@ -0,0 +1,52 @@
+require 'rgitflow/tasks/task'
+
+module RGitFlow
+  module Tasks
+    class SCM
+      class Task < RGitFlow::Tasks::Task
+        def initialize(git, name, description, namespaces=['rgitflow', 'scm'],
+                       dependencies=[])
+          super(git, name, description, namespaces, dependencies)
+        end
+
+        def dirty?
+          @git.diff.size > 0
+        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'
+          added.each { |f|
+            debug "  #{ANSI::Constants::GREEN}#{ANSI::Constants::BRIGHT}"\
+                  "#{f.path}#{ANSI::Constants::CLEAR}"
+          }
+
+          debug 'modified'
+          modified.each { |f|
+            debug "  #{ANSI::Constants::YELLOW}#{ANSI::Constants::BRIGHT}"\
+                  "#{f.path}#{ANSI::Constants::CLEAR}"
+          }
+
+          debug 'deleted'
+          deleted.each { |f|
+            debug "  #{ANSI::Constants::RED}#{ANSI::Constants::BRIGHT}"\
+                  "#{f.path}#{ANSI::Constants::CLEAR}"
+          }
+        end
+      end
+    end
+  end
+end

data/lib/rgitflow/version.rb

@@ -2,5 +2,5 @@
 module RGitFlow
   # Represents this gem's current version.
   # @return [String] current version
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/rgitflow.gemspec

@@ -6,7 +6,6 @@ require 'rgitflow/version'
 Gem::Specification.new do |spec|
   spec.name          = "rgitflow"
   spec.version       = RGitFlow::VERSION
-  spec.version = "#{spec.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if !ENV['TRAVIS_BRANCH'].nil? and ENV['TRAVIS_BRANCH'] != 'master'
   spec.authors       = ["Richard Harrah"]
   spec.email         = ["topplethenunnery@gmail.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgitflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre.alpha.pre.32
+  version: 0.2.2
 platform: ruby
 authors:
 - Richard Harrah
@@ -183,6 +183,7 @@ files:
 - lib/rgitflow/tasks/release/tasks.rb
 - lib/rgitflow/tasks/scm/status.rb
 - lib/rgitflow/tasks/scm/tag.rb
+- lib/rgitflow/tasks/scm/task.rb
 - lib/rgitflow/tasks/scm/tasks.rb
 - lib/rgitflow/tasks/task.rb
 - lib/rgitflow/version.rb
@@ -204,9 +205,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5