optimis-workflow-scripts 0.0.1 → 0.0.2

data/bin/finish-feature

@@ -1,28 +1,5 @@
 #!/usr/bin/env ruby
 
-# Syntax: finish-story msg
-# * Determine current local feature branch
-# * Extract story id from branch name (should be feature-STORYID)
-# * git checkout master
-# * git merge --squash feature-branch
-# * git commit 'Finish feature STORY TITLE [Story #STORYID]
-# * git push origin master
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/optimis-workflow'
 
-# system "git checkout master"
-
-current_branch = `git branch | grep '\*' | awk '{print $2}'`
-story_id       = current_branch.split("-").last.chomp!
-modified_files = `git ls-files --modified && git ls-files --deleted && git ls-files --unmerged`
-
-fail "Error! You must specify a commit message." unless ARGV[0]
-fail "Whoops! You have uncommitted changes! Please commit or stash everything and then run again." unless modified_files.empty?
-
-if ARGV[0] == "-h" || ARGV[0] == "--help" || ARGV[0] == "help"
-  puts "Syntax: finish-feature commit-msg"
-else
-  commit_message = ARGV[0].chomp
-  system 'git checkout master'
-  system "git merge --squash #{current_branch}"
-  system "git commit -m '#{commit_message} [finishes ##{story_id}\]'"
-  system "git push origin master"
-end
+OptimisWorkflow::Commands::FinishFeature.new(ARGV.dup).execute!

data/bin/finish-hotfix

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/optimis-workflow'
+
+OptimisWorkflow::Commands::FinishHotfix.new(ARGV.dup).execute!

data/bin/start-feature

@@ -1,35 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'yaml'
-require 'uri'
-require 'net/http'
-
-fail "Please pass in a story id" if ARGV.empty?
-
-if ARGV[0] == "-h" || ARGV[0] == "--help" || ARGV[0] == "help"
-  puts "Syntax: start-feature STORYID"
-else
-  story_id      = ARGV[0].chomp
-  current_dir   = `pwd`.chomp
-  settings_file = current_dir + '/.tracker_settings.yml'
-
-  @tracker_settings = YAML.load_file(settings_file) if File.exists?(settings_file)
-
-  unless @tracker_settings.nil?
-    url = URI.parse("http://www.pivotaltracker.com/services/v3/projects/#{@tracker_settings['project_id']}/stories/#{story_id}")
-    
-    net = Net::HTTP.new url.host, url.port
-    
-    net.start do |http|
-      payload = '<story><current_state>started</current_state></story>'
-      req = Net::HTTP::Put.new(url.request_uri, {'Content-type' => 'application/xml', 'X-TrackerToken' => @tracker_settings['token']})
-      http.request(req, payload)
-    end
-      
-  end
-
-  system "git checkout -b feature-#{story_id}"
-end
-
- 	
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/optimis-workflow'
 
+OptimisWorkflow::Commands::StartFeature.new(ARGV.dup).execute!

data/bin/start-hotfix

@@ -1,12 +1,5 @@
 #!/usr/bin/env ruby
 
-fail "Please pass in a hotfix story id" if ARGV.empty?
-
-if ARGV[0] == "-h" || ARGV[0] == "--help" || ARGV[0] == "help"
-  puts "Syntax: start-hotfix STORYID [stable]"
-else
-  stable_branch = ARGV[1] || 'stable'
-  system "git checkout -b hotfix-#{ARGV[0]} #{stable_branch}"
-end
-
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/optimis-workflow'
 
+OptimisWorkflow::Commands::StartHotfix.new(ARGV.dup).execute!

data/lib/optimis-workflow.rb

@@ -0,0 +1,16 @@
+require 'yaml'
+require 'uri'
+require 'net/http'
+
+require File.expand_path(File.dirname(__FILE__)) + "/optimis-workflow/common"
+
+require File.expand_path(File.dirname(__FILE__)) + "/optimis-workflow/commands/base"
+require File.expand_path(File.dirname(__FILE__)) + "/optimis-workflow/commands/start_command"
+require File.expand_path(File.dirname(__FILE__)) + "/optimis-workflow/commands/finish_command"
+
+require File.expand_path(File.dirname(__FILE__)) + "/optimis-workflow/commands/start_feature"
+require File.expand_path(File.dirname(__FILE__)) + "/optimis-workflow/commands/finish_feature"
+
+require File.expand_path(File.dirname(__FILE__)) + "/optimis-workflow/commands/start_hotfix"
+require File.expand_path(File.dirname(__FILE__)) + "/optimis-workflow/commands/finish_hotfix"
+

data/lib/optimis-workflow/commands/base.rb

@@ -0,0 +1,24 @@
+
+module OptimisWorkflow
+  module Commands
+    class Base
+      include OptimisWorkflow::Common
+      
+      attr_reader :args
+
+      def initialize(args)
+        if args[0] == "-h" || args[0] == "--help" || args[0] == "help"
+          puts help_msg
+          exit 0
+        else
+          @args = args
+        end
+      end
+
+      def execute!
+        local_stuff
+        remote_stuff
+      end
+    end
+  end
+end

data/lib/optimis-workflow/commands/finish_command.rb

@@ -0,0 +1,48 @@
+
+module OptimisWorkflow
+  module Commands
+    class FinishCommand < OptimisWorkflow::Commands::Base
+      attr_reader :feature_branch
+      def initialize(args)
+        super(args)
+        fail "\n\nError! You must specify a commit message.\n\n" if args[0].nil?
+        fail "\n\nWhoops! You have uncommitted changes! Please commit or stash everything and then run again.\n\n" unless self.class.modified_files.empty?
+
+        @feature_branch = `git branch | grep '\*' | awk '{print $2}'`
+      end
+
+      def self.modified_files
+        @modified_files ||= `git ls-files --modified && git ls-files --deleted && git ls-files --unmerged`
+      end
+
+      def story_id
+        @story_id ||= feature_branch.split("-").last.chomp!
+      end
+
+      def commit_msg
+        @commit_msg ||= args[0].chomp
+      end
+
+      def update_parent_branch
+        system "git checkout #{parent_branch}"
+        system "git pull origin #{parent_branch}"
+        system "git checkout #{feature_branch}"
+        system "git rebase #{parent_branch}"
+      end
+
+      def local_stuff
+        update_parent_branch
+        system "git checkout #{parent_branch}"
+        system "git merge --squash #{feature_branch}"
+        system "git commit -m '#{commit_msg} #{commit_msg_suffix}'"
+        system "git push origin #{parent_branch}"
+      end
+
+      def remote_stuff
+        # currently nothing needs to be done here b/c we're inserting a hook
+        # into the commit msg that will get sent to pivotal via a github
+        # post-receive callback.
+      end
+    end
+  end
+end

data/lib/optimis-workflow/commands/finish_feature.rb

@@ -0,0 +1,24 @@
+
+module OptimisWorkflow
+  module Commands
+    # * Determine current local feature branch
+    # * Extract story id from branch name (should be feature-STORYID)
+    # * git checkout master
+    # * git merge --squash feature-branch
+    # * git commit 'COMMITMSG [finishes #STORYID]
+    # * git push origin master
+    class FinishFeature < OptimisWorkflow::Commands::FinishCommand
+      def parent_branch
+        'master'
+      end
+
+      def commit_msg_suffix
+        "[finishes ##{story_id}]"
+      end
+
+      def help_msg
+        "Syntax: finish-feature commit-msg"
+      end
+    end
+  end
+end

data/lib/optimis-workflow/commands/finish_hotfix.rb

@@ -0,0 +1,50 @@
+
+module OptimisWorkflow
+  module Commands
+
+    # git checkout parent-branch
+    # git merge --squash hotfix-branch 
+    # git commit COMMITMSG [fixes #STORYID]
+    # git push origin stable
+    # git checkout hotfix-branch
+    # git push -f origin feature-branch:staging
+    # git checkout master
+    # git merge stable
+    # merge squashed commits into stable and master
+    # 
+    # mark as finished on pivotal
+    class FinishHotfix < OptimisWorkflow::Commands::FinishCommand
+      # need --no-deploy option
+
+      def local_stuff
+        super
+        do_deploy unless no_deploy?
+        update_master
+      end
+
+      def no_deploy?
+        args[1] && args[1].chomp == "--no-deploy"
+      end
+
+      def do_deploy
+        system "git checkout #{feature_branch}"
+        system "git push -f origin staging:#{feature_branch}"
+      end
+
+      def update_master
+        system "git checkout master"
+        system "git pull origin master"
+        system "git merge stable"
+      end
+
+      def commit_msg_suffix
+        "[fixes ##{story_id}]"
+      end
+
+      def parent_branch
+        'stable'
+      end
+    end
+
+  end
+end

data/lib/optimis-workflow/commands/start_command.rb

@@ -0,0 +1,15 @@
+
+module OptimisWorkflow
+  module Commands
+    class StartCommand < OptimisWorkflow::Commands::Base
+      def story_id
+        @story_id ||= args[0].chomp
+      end
+
+      def remote_stuff
+        mark_as_started_on_pivotal
+      end
+
+    end
+  end
+end

data/lib/optimis-workflow/commands/start_feature.rb

@@ -0,0 +1,19 @@
+
+module OptimisWorkflow
+  module Commands
+    class StartFeature < OptimisWorkflow::Commands::StartCommand
+      def initialize(args)
+        super(args)
+        fail "Please pass in a story id" if args.empty?
+      end
+
+      def local_stuff
+        system "git checkout -b feature-#{story_id}"
+      end
+
+      def help_msg
+        "Syntax: start-feature STORYID"
+      end
+    end
+  end
+end

data/lib/optimis-workflow/commands/start_hotfix.rb

@@ -0,0 +1,27 @@
+
+module OptimisWorkflow
+  module Commands
+    class StartHotfix < OptimisWorkflow::Commands::StartCommand
+      attr_reader :stable_branch
+
+      def initialize(args)
+        super(args)
+        if args.empty?
+          puts "\nError! Please pass in a hotfix story id"
+          exit 1
+        end
+        @stable_branch = args[1] || 'stable'
+      end
+
+      def help_msg
+        "Syntax: start-hotfix STORYID [stable]"
+      end
+
+      def local_stuff
+        system "git checkout -b hotfix-#{args[0]} #{stable_branch}"
+      end
+
+    end
+  end
+end
+

data/lib/optimis-workflow/common.rb

@@ -0,0 +1,47 @@
+
+module OptimisWorkflow
+
+  # This module gets included into OptimisWorkflow::Commands::Base
+  module Common
+    def settings_file
+      @settings_file ||= current_dir + '/.tracker_settings.yml'
+    end
+
+    def current_dir
+      @current_dir ||= `pwd`.chomp
+    end
+
+    def payload
+      '<story><current_state>started</current_state></story>'
+    end
+
+    def start_feature
+      story_id      = args[0].chomp
+      current_dir   = `pwd`.chomp
+
+      mark_as_started
+    end
+
+    def mark_as_started_on_pivotal
+      unless settings.nil?
+        url = URI.parse("http://www.pivotaltracker.com/services/v3/projects/#{settings['project_id']}/stories/#{story_id}")
+        
+        net = Net::HTTP.new url.host, url.port
+        
+        net.start do |http|
+          req = Net::HTTP::Put.new(url.request_uri, {'Content-type' => 'application/xml', 'X-TrackerToken' => settings['token']})
+          http.request(req, payload)
+        end
+      end
+    end
+
+    def settings
+      @tracker_settings ||= YAML.load_file(settings_file) if File.exists?(settings_file)
+    end
+
+    private
+      def sys(cmd)
+        system cmd
+      end
+  end
+end

data/spec/finish_hotfix_spec.rb

@@ -0,0 +1,31 @@
+require 'spec/spec_helper'
+
+def cmd_klass
+  OptimisWorkflow::Commands::FinishHotfix
+end
+
+describe OptimisWorkflow::Commands::FinishHotfix, 'when called with default opts' do
+  before :each do
+    Kernel.stub!(:system).and_return(true)
+    cmd_klass.stub!(:modified_files).and_return([])
+    @cmd = cmd_klass.new(['12345'])
+  end
+
+  it 'should attempt to perform a deploy' do
+    @cmd.should_receive(:do_deploy)
+    @cmd.execute!
+  end
+end
+
+describe OptimisWorkflow::Commands::FinishHotfix, 'when passed --no-deploy' do
+  before :each do
+    Kernel.stub!(:system).and_return(true)
+    cmd_klass.stub!(:modified_files).and_return([])
+    @cmd = cmd_klass.new(['12345', '--no-deploy'])
+  end
+  
+  it 'should not attempt to deploy the app' do
+    @cmd.should_not_receive(:do_deploy)
+    @cmd.execute!
+  end
+end

data/spec/spec.opts

@@ -0,0 +1,5 @@
+--colour
+--format
+s
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/optimis-workflow'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alex Sharp
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,12 +27,22 @@ executables:
 - start-hotfix
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.md
 files: 
 - bin/finish-feature
+- bin/finish-hotfix
 - bin/start-feature
 - bin/start-hotfix
+- lib/optimis-workflow/commands/base.rb
+- lib/optimis-workflow/commands/finish_command.rb
+- lib/optimis-workflow/commands/finish_feature.rb
+- lib/optimis-workflow/commands/finish_hotfix.rb
+- lib/optimis-workflow/commands/start_command.rb
+- lib/optimis-workflow/commands/start_feature.rb
+- lib/optimis-workflow/commands/start_hotfix.rb
+- lib/optimis-workflow/common.rb
+- lib/optimis-workflow.rb
 - LICENSE
 - README.md
 has_rdoc: true
@@ -65,5 +75,7 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A collection of scripts we use to manage our workflow at OptimisDev.
-test_files: []
-
+test_files: 
+- spec/finish_hotfix_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb