rgitflow 0.1.0.pre.alpha.pre.10 → 0.1.0.pre.alpha.pre.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI5ZWZjYzhjYmYwMDljY2Q4M2RlNjgzZTMzMmQyNTNkZWJhMDA2NA==
+    YzUxOWI3MjgwZTk1YTA0NGYyMjFhYzlhNTlkOTZiMjlmYmFiNjc5Nw==
   data.tar.gz: !binary |-
-    ZWQ5OTBhYzQ1MWU2YWVkMTYwNTJhNjY4NjJkZjk4ZjM1ZTRkM2ZjNw==
+    MzhhNjI5YjFhMjM3NTI0YjQ4NTdjYzEyMDM0M2M3NmY5Y2QwYzc0NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDEzZmE0NjQwMWNlMzE0YTI3Y2JjMjE2OTQ0ZjFmZTA3Y2I4NzhlZDkyNDI2
-    MjFkMzYyMGVjYjEzNjllMGU4ZmZhNGE2NjIyYjAxZDJiN2U2ODMwOWQ4MDQx
-    YmFjNWEyOWQ2ODBhZDA0N2ZkNGY2NDRiZTU1OGE2ODBmNzFmODE=
+    OGRhMjE1MWI3NWQ0ZjE1N2YzZWU2ZGUzNWZhMDMzZjdlYmIzZjAzMTc4ZDBk
+    NjBmMjA0ODhlYWRhNTYxYWFiMDI5OTQ2ZDYwYzk0OGFkZGU1ZDU0NTI4NmVh
+    YmFiM2Q0N2I0NzA1YWQ1NTU4NjE1MDBiYzRkZTQ3NTJhOGY5ZmE=
   data.tar.gz: !binary |-
-    YTliZmMzMjllNTQwYjRmMDdmMzRkYWE4MjI3YjBjYzdiNWQ2MTkzNWJmYWVk
-    OTFhM2RiZGI1MzhjYWEwMDlhMDcxNDdiZjY0YTM1MmRkZjlkZGY5NTRjOGEw
-    OWNlYmE2YzE5YjVkZTgyNWYwMWRjMGQ4ZTQ2ZjRhZDAxNWY3NTM=
+    MjliMzAwNzc1NTA3ZGI2ZmJlNmQwYzA5MWUyYzc0MDIyZGVlMmQzN2I4MmYy
+    ZDgzNDVjOGYwYmU4YTBkOTlmODdjNzgzMDkzYmY3ZmFkYTAyOGVjNTczMjIw
+    ZWEwOTI0OTJiNzFiZjBlZWJjZGI5ZmYyNjY3ODk0NDg1YmI3YWI=

data/lib/rgitflow/install.rb

@@ -26,6 +26,12 @@ module RGitFlow
 
       require 'rgitflow/tasks/feature/tasks'
       RGitFlow::Tasks::Feature.install_tasks({:git => @git})
+
+      require 'rgitflow/tasks/hotfix/tasks'
+      RGitFlow::Tasks::Hotfix.install_tasks({:git => @git})
+
+      require 'rgitflow/tasks/release/tasks'
+      RGitFlow::Tasks::Release.install_tasks({:git => @git})
     end
   end
 end

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

@@ -0,0 +1,36 @@
+require 'rgitflow/tasks/task'
+
+module RGitFlow
+  module Tasks
+    class Hotfix
+      class Finish < RGitFlow::Tasks::Task
+        def initialize(git)
+          super(git, 'finish', 'Finish a hotfix branch', ['rgitflow', 'hotfix'])
+        end
+
+        protected
+
+        def run
+          status 'Finishing hotfix branch...'
+
+          branch = @git.current_branch
+
+          unless branch.start_with? RGitFlow::Config.options[:hotfix]
+            error 'Cannot finish a hotfix branch unless you are in a hotfix branch'
+            abort
+          end
+
+          @git.branch(RGitFlow::Config.options[:master]).checkout
+          @git.merge branch
+
+          @git.push
+          @git.push('origin', branch, {:delete => true})
+
+          @git.branch(branch).delete
+
+          status "Finished hotfix branch #{branch}!"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+require 'rgitflow/tasks/task'
+
+module RGitFlow
+  module Tasks
+    class Hotfix
+      class Start < RGitFlow::Tasks::Task
+        def initialize(git)
+          super(git, 'start', 'Start a hotfix branch', ['rgitflow', 'hotfix'])
+        end
+
+        protected
+
+        def run
+          status 'Starting hotfix branch...'
+
+          unless @git.current_branch == RGitFlow::Config.options[:master]
+            error 'Cannot start a hotfix branch unless you are in the master branch'
+            abort
+          end
+
+          branch = ENV['BRANCH']
+
+          while branch.blank?
+            error 'Cannot create a branch with an empty name!'
+            prompt 'Please enter a name for your hotfix branch:'
+            branch = STDIN.gets.chomp
+          end
+
+          branch = [RGitFlow::Config.options[:hotfix], branch].join('/')
+
+          if @git.is_local_branch? branch
+            error 'Cannot create a branch that already exists locally'
+            abort
+          end
+
+          if @git.is_remote_branch? branch
+            error 'Cannot create a branch that already exists remotely'
+            abort
+          end
+
+          @git.branch(branch).create
+          @git.branch(branch).checkout
+
+          status "Started hotfix branch #{branch}!"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module RGitFlow
+  module Tasks
+    class Hotfix
+      autoload :Start, 'rgitflow/tasks/hotfix/start'
+      autoload :Finish, 'rgitflow/tasks/hotfix/finish'
+
+      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(Pathname.pwd)
+      end
+
+      def install
+        Start.new @git
+        Finish.new @git
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'rgitflow/tasks/task'
+
+module RGitFlow
+  module Tasks
+    class Release
+      class Finish < RGitFlow::Tasks::Task
+        def initialize(git)
+          super(git, 'finish', 'Finish a release branch', ['rgitflow', 'release'])
+        end
+
+        protected
+
+        def run
+          status 'Finishing release branch...'
+
+          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'
+            abort
+          end
+
+          @git.branch(RGitFlow::Config.options[:master]).checkout
+          @git.merge branch
+
+          @git.push
+          @git.push('origin', branch, {:delete => true})
+
+          @git.branch(branch).delete
+
+          status "Finished release branch #{branch}!"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+require 'rgitflow/tasks/task'
+
+module RGitFlow
+  module Tasks
+    class Release
+      class Start < RGitFlow::Tasks::Task
+        def initialize(git)
+          super(git, 'start', 'Start a release branch', ['rgitflow', 'release'])
+        end
+
+        protected
+
+        def run
+          status 'Starting release branch...'
+
+          unless @git.current_branch == RGitFlow::Config.options[:develop]
+            error 'Cannot create release branch unless on development branch'
+            abort
+          end
+
+          branch = ENV['BRANCH']
+
+          while branch.blank?
+            error 'Cannot create a branch with an empty name!'
+            prompt 'Please enter a name for your release branch:'
+            branch = STDIN.gets.chomp
+          end
+
+          branch = [RGitFlow::Config.options[:release], branch].join('/')
+
+          if @git.is_local_branch? branch
+            error 'Cannot create a branch that already exists locally'
+            abort
+          end
+
+          if @git.is_remote_branch? branch
+            error 'Cannot create a branch that already exists remotely'
+            abort
+          end
+
+          @git.branch(branch).create
+          @git.branch(branch).checkout
+
+          status "Started release branch #{branch}!"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module RGitFlow
+  module Tasks
+    class Release
+      autoload :Start, 'rgitflow/tasks/release/start'
+      autoload :Finish, 'rgitflow/tasks/release/finish'
+
+      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(Pathname.pwd)
+      end
+
+      def install
+        Start.new @git
+        Finish.new @git
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgitflow
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha.pre.10
+  version: 0.1.0.pre.alpha.pre.11
 platform: ruby
 authors:
 - Richard Harrah
@@ -142,6 +142,12 @@ files:
 - lib/rgitflow/tasks/feature/finish.rb
 - lib/rgitflow/tasks/feature/start.rb
 - lib/rgitflow/tasks/feature/tasks.rb
+- lib/rgitflow/tasks/hotfix/finish.rb
+- lib/rgitflow/tasks/hotfix/start.rb
+- lib/rgitflow/tasks/hotfix/tasks.rb
+- lib/rgitflow/tasks/release/finish.rb
+- lib/rgitflow/tasks/release/start.rb
+- lib/rgitflow/tasks/release/tasks.rb
 - lib/rgitflow/tasks/scm/status.rb
 - lib/rgitflow/tasks/task.rb
 - lib/rgitflow/version.rb