gitcycle 0.3.3 → 0.3.4

data/.gitignore

@@ -6,4 +6,5 @@ features/config/config.yml
 features/fixtures
 Gemfile.lock
 pkg
+spec/config/gitcycle.yml
 tmp

data/.ruby-gemset

@@ -0,0 +1 @@
+gitcycle

data/.ruby-version

@@ -0,0 +1 @@
+ree-1.8.7-2012.02

data/README.md

@@ -1,7 +1,7 @@
 Gitcycle
 ========
 
-Tame your development cycle.
+Development cycle automation.
 
 About
 -----

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.3.3'
+  s.version     = '0.3.4'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle/branch.rb

@@ -0,0 +1,77 @@
+class Gitcycle
+  module Branch
+
+    def branch(*args)
+      url = args.detect { |arg| arg =~ /^https?:\/\// }
+      title = args.detect { |arg| arg =~ /\s/ }
+
+      exec_git(:branch, args) unless url || title
+
+      require_git && require_config
+
+      params = {
+        'branch[source]' => branches(:current => true)
+      }
+
+      if url && url.include?('lighthouseapp.com/')
+        params.merge!('branch[lighthouse_url]' => url)
+      elsif url && url.include?('github.com/')
+        params.merge!('branch[issue_url]' => url)
+      elsif url
+        puts "Gitcycle only supports Lighthouse or Github Issue URLs.".red
+        exit ERROR[:unrecognized_url]
+      elsif title
+        params.merge!(
+          'branch[name]' => title,
+          'branch[title]' => title
+        )
+      else
+        exec_git(:branch, args)
+      end
+
+      unless yes?("\nYour work will eventually merge into '#{params['branch[source]']}'. Is this correct?")
+        params['branch[source]'] = q("What branch would you like to eventually merge into?")
+      end
+
+      source = params['branch[source]']
+
+      puts "\nRetrieving branch information from gitcycle.\n".green
+      branch = get('branch', params)
+      name = branch['name']
+
+      begin
+        owner, repo = branch['repo'].split(':')
+        branch['home'] ||= @git_login
+
+        unless yes?("Would you like to name your branch '#{name}'?")
+          name = q("\nWhat would you like to name your branch?")
+          name = name.gsub(/[\s\W]/, '-')
+        end
+
+        checkout_remote_branch(
+          :owner => owner,
+          :repo => repo,
+          :branch => branch['source'],
+          :target => name
+        )
+
+        puts "Sending branch information to gitcycle.".green
+        get('branch',
+            'branch[home]' => branch['home'],
+            'branch[name]' => branch['name'],
+            'branch[rename]' => name != branch['name'] ? name : nil,
+            'branch[source]' => branch['source']
+        )
+      rescue SystemExit, Interrupt
+        puts "\nDeleting branch from gitcycle.\n".green
+        get('branch',
+          'branch[name]' => branch['name'],
+          'create' => 0,
+          'reset' => 1
+        )
+      end
+
+      puts "\n"
+    end
+  end
+end

data/lib/gitcycle/checkout.rb

@@ -0,0 +1,92 @@
+class Gitcycle
+  module Checkout
+
+    def checkout(*args)
+      if args.length != 1 || options?(args)
+        exec_git(:checkout, args)
+      end
+
+      require_git && require_config
+
+      if args[0] =~ /^https?:\/\//
+        puts "\nRetrieving branch information from gitcycle.\n".green
+        branch = get('branch', 'branch[lighthouse_url]' => args[0], 'create' => 0)
+        if branch
+          checkout_or_track(:name => branch['name'], :remote => 'origin')
+        else
+          puts "\nBranch not found!\n".red
+          puts "\nDid you mean: gitc branch #{args[0]}\n".yellow
+        end
+      elsif args[0] =~ /^\d*$/
+        puts "\nLooking for a branch for LH ticket ##{args[0]}.\n".green
+        results = branches(:array => true).select {|b| b.include?("-#{args[0]}-") }
+        if results.size == 0
+          puts "\nNo matches for ticket ##{args[0]} found.\n".red
+        elsif results.size == 1
+          branch = results.first
+          if branch.strip == branches(:current => true).strip
+            puts "Already on Github branch for LH ticket ##{args[0]} (#{branch})".yellow
+          else
+            puts "\nSwitching to branch '#{branch}'\n".green
+            run("git checkout #{branch}")
+          end
+        else
+          puts "\nFound #{results.size} matches with that LH ticket number:\n".yellow
+          puts results
+          puts "\nDid not switch branches. Please check your ticket number.\n".red
+        end
+      else
+        remote, branch = args[0].split('/')
+        remote, branch = nil, remote if branch.nil?
+        collab = branch && remote
+
+        unless branches(:match => branch)
+          og_remote = nil
+
+          puts "\nRetrieving repo information from gitcycle.\n".green
+          repo = get('repo')
+          remote = repo['owner'] unless collab
+          
+          output = add_remote_and_fetch(
+            :catch => false,
+            :owner => remote,
+            :repo => @git_repo
+          )
+
+          if errored?(output)
+            og_remote = remote
+            remote = repo["owner"]
+
+            add_remote_and_fetch(
+              :owner => remote,
+              :repo => @git_repo
+            )
+          end
+          
+          puts "Creating branch '#{branch}' from '#{remote}/#{branch}'.\n".green
+          output = run("git branch --no-track #{branch} #{remote}/#{branch}", :catch => false)
+
+          if errored?(output)
+            puts "Could not find branch #{"'#{og_remote}/#{branch}' or " if og_remote}'#{remote}/#{branch}'.\n".red
+            exit ERROR[:could_not_find_branch]
+          end
+        end
+
+        if collab
+          puts "Sending branch information to gitcycle.".green
+          get('branch',
+            'branch[home]' => remote,
+            'branch[name]' => branch,
+            'branch[source]' => branch,
+            'branch[collab]' => 1,
+            'create' => 1
+          )
+        end
+
+        puts "Checking out '#{branch}'.\n".green
+        run("git checkout -q #{branch}")
+      end
+    end
+    alias :co :checkout
+  end
+end

data/lib/gitcycle/commit.rb

@@ -0,0 +1,44 @@
+class Gitcycle
+  module Commit
+
+    def commit(*args)
+      msg = nil
+      no_add = args.delete("--no-add")
+
+      if args.empty?
+        require_git && require_config
+
+        puts "\nRetrieving branch information from gitcycle.\n".green
+        branch = get('branch',
+          'branch[name]' => branches(:current => true),
+          'create' => 0
+        )
+
+        id = branch["lighthouse_url"].match(/tickets\/(\d+)/)[1] rescue nil
+
+        if branch && id
+          msg = "[##{id}]"
+          msg += " #{branch["title"]}" if branch["title"]
+        end
+      end
+
+      if no_add
+        cmd = "git commit"
+      else
+        cmd = "git add . && git add . -u && git commit -a"
+      end
+
+      if File.exists?("#{Dir.pwd}/.git/MERGE_HEAD")
+        Kernel.exec(cmd)
+      elsif msg
+        run(cmd + " -m #{msg.dump.gsub('`', "'")}")
+        Kernel.exec("git commit --amend")
+      elsif args.empty?
+        Kernel.exec(cmd)
+      else
+        exec_git(:commit, args)
+      end
+    end
+    alias :ci :commit
+  end
+end

data/lib/gitcycle/discuss.rb

@@ -0,0 +1,36 @@
+class Gitcycle
+  module Discuss
+
+    def discuss(*issues)
+      require_git && require_config
+
+      if issues.empty?
+        branch = create_pull_request
+
+        if branch == false
+          puts "Branch not found.\n".red
+        elsif branch['issue_url']
+          puts "\nLabeling issue as 'Discuss'.\n".green
+          get('label',
+            'branch[name]' => branch['name'],
+            'labels' => [ 'Discuss' ]
+          )
+
+          puts "Opening issue: #{branch['issue_url']}\n".green
+          Launchy.open(branch['issue_url'])
+        else
+          puts "You must push code before opening a pull request.\n".red
+        end
+      else
+        puts "\nRetrieving branch information from gitcycle.\n".green
+
+        get('branch', 'issues' => issues, 'scope' => 'repo').each do |branch|
+          if branch['issue_url']
+            puts "Opening issue: #{branch['issue_url']}\n".green
+            Launchy.open(branch['issue_url'])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitcycle/incident.rb

@@ -0,0 +1,115 @@
+class Gitcycle
+  module Incident
+
+    def incident(*args)
+      puts "\nRetrieving statuspage.io information from gitcycle.\n".green
+      
+      statuspage = get('statuspage')
+      components = statuspage['components']
+      incidents  = statuspage['incidents']
+      page       = statuspage['page']
+      
+      incident_statuses  = %w(investigating identified monitoring resolved)
+      incident_colors    = %w(red           yellow     yellow     green)
+      
+      component_statuses = %w(operational degraded_performance partial_outage major_outage)
+      component_colors   = %w(green       yellow               yellow         red)
+
+      puts_statuses(incidents, incident_statuses, incident_colors)
+
+      incident = q "\n#{"Incident #?".yellow} (press enter for new incident)"
+
+      if incident.strip == ""
+        incident     = {}
+        new_incident = q "#{"New incident name?".yellow} (required)"
+      else
+        incident = incidents[incident.to_i]
+      end
+
+      unless incident['id'] || new_incident
+        puts "Incident not found."
+        exit
+      end
+
+      puts_names(incident_statuses, incident_colors)
+
+      incident_status = q "\n#{"Incident status #?".yellow} (required)"
+      incident_body   = q "\n#{"Describe the incident".yellow} (enter for none)"
+
+      incident_status  = incident_statuses[incident_status.to_i]
+
+      unless incident_status
+        puts "Incident status not found."
+        exit
+      end
+
+      puts_statuses(components, component_statuses, component_colors)
+
+      component = q "\n#{"Service #?".yellow} (required)"
+      component = components[component.to_i]
+
+      unless component
+        puts "Service not found."
+        exit
+      end
+
+      puts_names(component_statuses, component_colors)
+
+      component_status = q "\n#{"Service status #?".yellow} (required)"
+      component_status = component_statuses[component_status.to_i]
+
+      unless component_status
+        puts "Component status not found."
+        exit
+      end
+
+      params = {
+        :new_incident     => new_incident,
+        :incident         => incident['id'],
+        :component        => component['id'],
+        :component_status => component_status,
+        :incident_status  => incident_status,
+        :incident_body    => incident_body
+      }
+
+      puts "\nUpdating statuspage.io...".green
+      get('statuspage/update', params)
+
+      puts "\nSuccess!\n".green
+
+      sleep 0.5
+      Launchy.open("http://#{page['subdomain']}.statuspage.io")
+    end
+
+    private
+
+    def format_name(name)
+      name.gsub(/_/, ' ').capitalize
+    end
+
+    def longest_name(array)
+      array.map { |a| a['name'].length }.max
+    end
+
+    def puts_names(array, colors)
+      puts ""
+
+      array.each_with_index do |a, i|
+        puts "[#{i}] #{format_name(a).send(colors[i])}"
+      end
+    end
+
+    def puts_statuses(array, statuses, colors)
+      longest = longest_name(array)
+      puts ""
+
+      array.each_with_index do |a, i|
+        name   = a['name']
+        status = a['status']
+        status = format_name(status).send(colors[statuses.index(status)])
+
+        puts "[#{i}] #{name} #{" " * (longest - name.length)} #{status}"
+      end
+    end
+  end
+end

data/lib/gitcycle/open.rb

@@ -0,0 +1,32 @@
+class Gitcycle
+  module Open
+
+    def open(*issues)
+      require_git && require_config
+
+      if issues.empty?
+        branch = create_pull_request
+
+        if branch == false
+          puts "Branch not found.\n".red
+        elsif branch['issue_url']
+          puts "\nOpening the pull request in GitHub\n".green
+
+          puts "Opening issue: #{branch['issue_url']}\n".green
+          Launchy.open(branch['issue_url'])
+        else
+          puts "You must push code before opening a pull request.\n".red
+        end
+      else
+        puts "\nRetrieving branch information from gitcycle.\n".green
+
+        get('branch', 'issues' => issues, 'scope' => 'repo').each do |branch|
+          if branch['issue_url']
+            puts "Opening issue: #{branch['issue_url']}\n".green
+            Launchy.open(branch['issue_url'])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitcycle/pull.rb

@@ -0,0 +1,56 @@
+class Gitcycle
+  module Pull
+
+    def pull(*args)
+      exec_git(:pull, args) if args.length > 0
+
+      require_git && require_config
+
+      current_branch = branches(:current => true)
+
+      puts "\nRetrieving branch information from gitcycle.\n".green
+      branch = get('branch',
+        'branch[name]' => current_branch,
+        'include' => [ 'repo' ],
+        'create' => 0
+      )
+
+      if branch && branch['collab']
+        # Merge from collab
+        merge_remote_branch(
+          :owner => owner = branch['home'],
+          :repo => branch['repo']['name'],
+          :branch => branch['source']
+        )
+      elsif branch
+        # Merge from upstream source branch
+        merge_remote_branch(
+          :owner => owner = branch['repo']['owner'],
+          :repo => branch['repo']['name'],
+          :branch => branch['source']
+        )
+      else
+        puts "\nRetrieving repo information from gitcycle.\n".green
+        repo = get('repo')
+
+        # Merge from upstream branch with same name
+        merge_remote_branch(
+          :owner => owner = repo['owner'],
+          :repo => repo['name'],
+          :branch => current_branch
+        )
+      end
+
+      unless branch && branch['collab'] || owner == @git_login
+        # Merge from origin
+        merge_remote_branch(
+          :owner => @git_login,
+          :repo => @git_repo,
+          :branch => current_branch
+        )
+      end
+
+      branch
+    end
+  end
+end

data/lib/gitcycle/push.rb

@@ -0,0 +1,24 @@
+class Gitcycle
+  module Push
+
+    def push(*args)
+      exec_git(:push, args) if args.length > 0
+
+      require_git && require_config
+
+      branch = pull
+
+      if branch && branch['collab']
+        puts "\nPushing branch '#{branch['home']}/#{branch['name']}'.\n".green
+        run("git push #{branch['home']} #{branch['name']} -q")
+      elsif branch
+        puts "\nPushing branch 'origin/#{branch['name']}'.\n".green
+        run("git push origin #{branch['name']} -q")
+      else
+        current_branch = branches(:current => true)
+        puts "\nPushing branch 'origin/#{current_branch}'.\n".green
+        run("git push origin #{current_branch} -q")
+      end
+    end
+  end
+end