git-smart 0.1.6 → 0.1.7

data/Gemfile

@@ -3,9 +3,7 @@ source :rubygems
 gem 'colorize'
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "rcov", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rocco"
+  gem 'rspec'
+  gem 'rcov'
+  gem 'rocco'
 end

data/Gemfile.lock

@@ -2,35 +2,27 @@ GEM
   remote: http://rubygems.org/
   specs:
     colorize (0.5.8)
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mustache (0.12.0)
-    rake (0.8.7)
-    rcov (0.9.8)
-    rdiscount (1.6.5)
-    rocco (0.5)
+    diff-lcs (1.1.3)
+    mustache (0.99.4)
+    rcov (0.9.11)
+    redcarpet (1.17.2)
+    rocco (0.8.2)
       mustache
-      rdiscount
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+      redcarpet
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
   colorize
-  jeweler (~> 1.5.2)
   rcov
   rocco
-  rspec (~> 2.3.0)
+  rspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Glen Maddern
+Copyright (c) 2011 Glen Maddern and Envato Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -21,7 +21,7 @@ You almost certainly want to run this as well, to allow git commands to be outpu
     git config --global color.ui always
 
 Git normally only colours output when being run from the terminal, not from within scripts like these. This sorts that right out.
-  
+
 ## Get smart!
 
 There's only three commands at this point, but there'll be more!
@@ -64,5 +64,5 @@ Recommended alias to use: `gl`
 
 ## Copyright
 
-Copyright (c) 2011 Glen Maddern. See LICENSE.txt for
+Copyright (c) 2011 Glen Maddern and Envato Pty Ltd. See LICENSE.txt for
 further details.

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -7,20 +8,8 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "git-smart"
-  gem.homepage = "http://github.com/geelen/git-smart"
-  gem.license = "MIT"
-  gem.summary = %Q{Add some smarts to your git workflow}
-  gem.description = %Q{Installs some additional 'smart' git commands, like `git smart-pull`.}
-  gem.email = "glenmaddern@gmail.com"
-  gem.authors = ["Glen Maddern"]
-end
-Jeweler::RubygemsDotOrgTasks.new
+require 'rake'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -35,7 +24,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
@@ -79,4 +68,4 @@ GitSmart.run('#{cmd}', ARGV)
   }
 end
 
-task :gemspec => :generate_binaries
+task :build => :generate_binaries

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/docs/introductory_blog_post.md

@@ -0,0 +1,43 @@
+# Introducing git-smart
+
+Recently, I grappled with some unexpected git behaviour when trying to rebase local changes (in particular, merge commits) onto changes from upstream. I blogged about [the solution](http://notes.envato.com/developers/rebasing-merge-commits-in-git/), which is to use `git rebase -p`, but I still didn't feel 'done'.
+
+Most of the dev team here at Envato had begun using my [aliases](https://gist.github.com/590895), but it's not exactly an easy or maintainable solution. I also wanted to do more, such as stashing local changes if required, using fast-forward when possible, and giving more feedback to the user. But most importantly, I wanted to remove the 'magic' from using someone else's aliases and help people understand the decisions behind choosing the 'correct' git command to run.
+
+## A gem is born
+
+Git allows you to add arbitrary commands by placing executables on the path. When you type `git some-custom-command`, git looks for a `git-custom-command` executable on your path and executes it. It can be in any language you want and has no special access to git's internals. It's perfect.
+
+Packaging gems also allows you to generate any number of custom executables onto the path. It's perfect, too!
+
+Putting them together, we get [git-smart](http://github.com/geelen/git-smart):
+
+![git-smart logo](https://github.com/geelen/git-smart/raw/master/docs/images/git-smart.png)
+
+Installing it is as easy as `gem install git-smart` and will give you three new commands, `git smart-pull`, `git smart-merge` and `git smart-log`:
+
+## git smart-pull, the new king of the 'fetch & rebase' workflow
+
+The first command I wrote was designed to expand on the knowledge behind `gup`, giving people a reliably-safe method of pulling updates from the server. I also wanted to give plenty of feedback to the user while it runs, and have the source code as [readable and well-documented as possible](http://github-displayer.heroku.com/geelen/git-smart/raw/master/docs/smart-pull.html).
+
+In a nutshell, this script will detect which branch you want to pull from, assuming origin/same-branch-name if you haven't set up branch-tracking. If the remote branch hasn't moved on, there's nothing to do. If your local branch hasn't moved on, it can simply be fast-forwarded (wrapped in a `git stash`/`git stash pop` if necessary). Only if both the remote and your local branch have moved on, fall back to a `git rebase -p`, again wrapped in a stash/pop if needed. Easy!
+
+This is what it looks like:
+
+![screenshot](https://github.com/geelen/git-smart/raw/master/docs/images/smart-pull-screenshot.png)
+
+## git smart-merge, a non-fast-forward merge wrapped in a stash
+
+If you haven't read ["A successful Git branching model"](http://nvie.com/posts/a-successful-git-branching-model/) by Vincent Driessen, you really should. It's good stuff, and it makes the argument for using the `--no-ff` flag whenever you merge. I won't repeat the arguments here, but I wrote `git smart-merge` to effectively make `--no-ff` the default. It also does a stash/pop if required.
+
+For more detail, take a look at the [annotated source code](http://github-displayer.heroku.com/geelen/git-smart/raw/master/docs/smart-merge.html).
+
+## git smart-log, the most blinged out ASCII log possible
+
+Use this in place of `git log`. I'll let the output speak for itself:
+
+![screenshot](https://github.com/geelen/git-smart/raw/master/docs/images/smart-log-comparison.png)
+
+Check out the [code itself](http://github-displayer.heroku.com/geelen/git-smart/raw/master/docs/smart-log.html). Hat tip to [@ben_h](http://twitter.com/ben_h) for the guts of this.
+
+Also, if you're on OSX and not using [brotherbard's fork of gitx](https://github.com/brotherbard/gitx/wiki), you really should be. It's absolutely the best way to navigate through a git project's history.

data/docs/smart-log.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8">
+  <title>smart-log.rb</title>
+  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
+</head>
+<body>
+<div id='container'>
+  <div id="background"></div>
+  <div id="jump_to">
+    Jump To &hellip;
+    <div id="jump_wrapper">
+      <div id="jump_page">
+          <a class="source" href="smart-log.html">smart-log.rb</a>
+          <a class="source" href="smart-merge.html">smart-merge.rb</a>
+          <a class="source" href="smart-pull.html">smart-pull.rb</a>
+      </div>
+    </div>
+  </div>
+  <table cellspacing=0 cellpadding=0>
+  <thead>
+    <tr>
+      <th class=docs><h1>smart-log.rb</h1></th>
+      <th class=code></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr id='section-1'>
+      <td class=docs>
+        <div class="octowrap">
+          <a class="octothorpe" href="#section-1">#</a>
+        </div>
+        <p>This is a super simple alias for the most badass of log outputs that git
+offers. Uses git log &mdash;graph under the hood.</p>
+
+<p>Thanks to <a href="http://twitter.com/ben_h">@ben_h</a> for this one!</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre><span class="no">GitSmart</span><span class="o">.</span><span class="n">register</span> <span class="s1">&#39;smart-log&#39;</span> <span class="k">do</span> <span class="o">|</span><span class="n">repo</span><span class="p">,</span> <span class="n">args</span><span class="o">|</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-2'>
+      <td class=docs>
+        <div class="octowrap">
+          <a class="octothorpe" href="#section-2">#</a>
+        </div>
+        <p>Super simple, passes the args through to git log, but
+ratchets up the badassness quotient.</p>
+
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>  <span class="n">repo</span><span class="o">.</span><span class="n">log_to_shell</span><span class="p">(</span><span class="s1">&#39;--pretty=format:%Cblue%h%d%Creset %ar %Cgreen%an%Creset %s&#39;</span><span class="p">,</span> <span class="s1">&#39;--graph&#39;</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">)</span>
+<span class="k">end</span></pre></div>
+      </td>
+    </tr>
+  </table>
+</div>
+</body>

data/docs/smart-merge.html

@@ -12,6 +12,7 @@
     Jump To …
     <div id="jump_wrapper">
       <div id="jump_page">
+          <a class="source" href="smart-log.html">smart-log.rb</a>
           <a class="source" href="smart-merge.html">smart-merge.rb</a>
           <a class="source" href="smart-pull.html">smart-pull.rb</a>
       </div>

data/docs/smart-pull.html

@@ -12,6 +12,7 @@
     Jump To …
     <div id="jump_wrapper">
       <div id="jump_page">
+          <a class="source" href="smart-log.html">smart-log.rb</a>
           <a class="source" href="smart-merge.html">smart-merge.rb</a>
           <a class="source" href="smart-pull.html">smart-pull.rb</a>
       </div>
@@ -34,7 +35,7 @@
 and reapply your work on top of it. It&rsquo;s like a much, much
 smarter version of <code>git pull --rebase</code>.</p>
 
-<p>For some background as to why this is needed, see <a href="https://gist.github.com/591209">my blog
+<p>For some background as to why this is needed, see <a href="http://notes.envato.com/developers/rebasing-merge-commits-in-git/">my blog
 post about the perils of rebasing merge commits</a></p>
 
 <p>This is how it works:</p>
@@ -244,7 +245,7 @@ to pull.</p>
         <p>If our local branch has new commits, we need to rebase them on top of master.</p>
 
 <p>When we rebase, we use <code>git rebase -p</code>, which attempts to recreate merges
-instead of ignoring them. For a description as to why, see my <a href="(https://gist.github.com/591209">blog post</a>.</p>
+instead of ignoring them. For a description as to why, see my <a href="http://notes.envato.com/developers/rebasing-merge-commits-in-git/">blog post</a>.</p>
       </td>
       <td class=code>
         <div class='highlight'><pre>        <span class="n">note</span> <span class="s2">&quot;Both local and remote branches have moved on. Branch &#39;master&#39; needs to be rebased onto &#39;origin/master&#39;&quot;</span>

data/lib/commands/smart-log.rb

@@ -5,5 +5,5 @@
 GitSmart.register 'smart-log' do |repo, args|
   #Super simple, passes the args through to git log, but
   #ratchets up the badassness quotient.
-  repo.log_to_shell('--pretty=format:%Cblue%h%d%Creset %ar %Cgreen%an%Creset %s', '--graph', *args)
+  repo.log_to_shell('--pretty=format:%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset', '--graph', *args)
 end

data/lib/commands/smart-pull.rb

@@ -3,7 +3,7 @@
 #smarter version of `git pull --rebase`.
 #
 #For some background as to why this is needed, see [my blog
-#post about the perils of rebasing merge commits](https://gist.github.com/591209)
+#post about the perils of rebasing merge commits](http://notes.envato.com/developers/rebasing-merge-commits-in-git/)
 #
 #This is how it works:
 
@@ -89,7 +89,7 @@ GitSmart.register 'smart-pull' do |repo, args|
         #If our local branch has new commits, we need to rebase them on top of master.
         #
         #When we rebase, we use `git rebase -p`, which attempts to recreate merges
-        #instead of ignoring them. For a description as to why, see my [blog post]((https://gist.github.com/591209).
+        #instead of ignoring them. For a description as to why, see my [blog post](http://notes.envato.com/developers/rebasing-merge-commits-in-git/).
         note "Both local and remote branches have moved on. Branch 'master' needs to be rebased onto 'origin/master'"
         repo.rebase_preserving_merges!(upstream_branch)
         success_messages << "HEAD moved from #{head[0,7]} to #{repo.sha('HEAD')[0,7]}."
@@ -101,6 +101,9 @@ GitSmart.register 'smart-pull' do |repo, args|
         repo.stash_pop!
       end
 
+      #Use smart-log to show the new commits.
+      GitSmart.run('smart-log', ["#{merge_base}..#{upstream_branch}"])
+
       #Display a nice completion message in large, friendly letters.
       success ["All good.", *success_messages].join(" ")
     end

metadata

@@ -1,138 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-smart
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+version: !ruby/object:Gem::Version
+  version: 0.1.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Glen Maddern
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-06 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+date: 2011-01-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: colorize
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70227984126720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: *70227984126720
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70227984126060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :development
-  name: rcov
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70227984126060
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70227984125420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+  version_requirements: *70227984125420
+- !ruby/object:Gem::Dependency
   name: rocco
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70227984124580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70227984124580
 description: Installs some additional 'smart' git commands, like `git smart-pull`.
 email: glenmaddern@gmail.com
-executables: 
+executables:
 - git-smart-log
-- git-smart-pull
 - git-smart-merge
+- git-smart-pull
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.md
-- Rakefile
-- VERSION
-- bin/git-smart-log
-- bin/git-smart-merge
-- bin/git-smart-pull
+files:
 - docs/images/git-smart.png
+- docs/images/smart-log-comparison.png
+- docs/images/smart-pull-screenshot.png
+- docs/introductory_blog_post.md
+- docs/smart-log.html
 - docs/smart-merge.html
 - docs/smart-pull.html
-- git-smart.gemspec
 - lib/commands/smart-log.rb
 - lib/commands/smart-merge.rb
 - lib/commands/smart-pull.rb
@@ -145,45 +85,45 @@ files:
 - lib/git-smart/git_repo.rb
 - lib/git-smart/git_smart.rb
 - lib/git-smart/safe_shell.rb
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.md
+- Rakefile
+- VERSION
 - spec/smart-merge_failures_spec.rb
 - spec/smart-merge_spec.rb
 - spec/smart-pull_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+- bin/git-smart-log
+- bin/git-smart-merge
+- bin/git-smart-pull
 homepage: http://github.com/geelen/git-smart
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6.1
 signing_key: 
 specification_version: 3
 summary: Add some smarts to your git workflow
-test_files: 
+test_files:
 - spec/smart-merge_failures_spec.rb
 - spec/smart-merge_spec.rb
 - spec/smart-pull_spec.rb

data/git-smart.gemspec

@@ -1,91 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{git-smart}
-  s.version = "0.1.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Glen Maddern"]
-  s.date = %q{2011-01-06}
-  s.description = %q{Installs some additional 'smart' git commands, like `git smart-pull`.}
-  s.email = %q{glenmaddern@gmail.com}
-  s.executables = ["git-smart-log", "git-smart-pull", "git-smart-merge"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/git-smart-log",
-    "bin/git-smart-merge",
-    "bin/git-smart-pull",
-    "docs/images/git-smart.png",
-    "docs/smart-merge.html",
-    "docs/smart-pull.html",
-    "git-smart.gemspec",
-    "lib/commands/smart-log.rb",
-    "lib/commands/smart-merge.rb",
-    "lib/commands/smart-pull.rb",
-    "lib/core_ext/array.rb",
-    "lib/core_ext/hash.rb",
-    "lib/core_ext/object.rb",
-    "lib/git-smart.rb",
-    "lib/git-smart/exceptions.rb",
-    "lib/git-smart/execution_context.rb",
-    "lib/git-smart/git_repo.rb",
-    "lib/git-smart/git_smart.rb",
-    "lib/git-smart/safe_shell.rb",
-    "spec/smart-merge_failures_spec.rb",
-    "spec/smart-merge_spec.rb",
-    "spec/smart-pull_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/geelen/git-smart}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Add some smarts to your git workflow}
-  s.test_files = [
-    "spec/smart-merge_failures_spec.rb",
-    "spec/smart-merge_spec.rb",
-    "spec/smart-pull_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<colorize>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rocco>, [">= 0"])
-    else
-      s.add_dependency(%q<colorize>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rocco>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<colorize>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rocco>, [">= 0"])
-  end
-end
-