drnic-github 0.3.9 → 0.3.10

data/History.txt

@@ -1,3 +1,18 @@
+== 0.3.10
+
+* gh clone --search query -- now includes project descriptions
+* bugfix
+  * added highline dependency
+
+== 0.3.9
+
+* gh clone --search query -- to search for a repo and then clone it
+* fixed all the specs and started covering some commands that did not already have specs
+
+== 0.3.X
+
+* Some stuff done by some people
+
 == 0.1.4
 
 * Added usage notes to commands. [topfunky]

data/Manifest

@@ -5,7 +5,6 @@ README
 Rakefile
 bin/gh
 bin/github
-github.gemspec
 lib/commands/commands.rb
 lib/commands/helpers.rb
 lib/commands/issues.rb
@@ -17,9 +16,22 @@ lib/github/helper.rb
 lib/github/ui.rb
 setup.rb
 spec/command_spec.rb
+spec/commands/command_browse_spec.rb
+spec/commands/command_clone_spec.rb
+spec/commands/command_create-from-local_spec.rb
+spec/commands/command_fetch_spec.rb
+spec/commands/command_fork_spec.rb
+spec/commands/command_helper.rb
+spec/commands/command_home_spec.rb
+spec/commands/command_info_spec.rb
+spec/commands/command_network_spec.rb
+spec/commands/command_pull-request_spec.rb
+spec/commands/command_pull_spec.rb
+spec/commands/command_search_spec.rb
+spec/commands/command_track_spec.rb
+spec/commands_spec.rb
 spec/extensions_spec.rb
 spec/github_spec.rb
 spec/helper_spec.rb
 spec/spec_helper.rb
-spec/ui_spec.rb
 spec/windoze_spec.rb

data/Rakefile

@@ -4,14 +4,17 @@ require 'rake'
 begin
   require 'echoe'
 
-  Echoe.new('github', '0.3.9') do |p|
+  Echoe.new('github', '0.3.10') do |p|
     p.rubyforge_name = 'github'
     p.summary      = "The official `github` command line helper for simplifying your GitHub experience."
     p.description  = "The official `github` command line helper for simplifying your GitHub experience."
     p.url          = "http://github.com/"
     p.author       = ['Chris Wanstrath', 'Kevin Ballard', 'Scott Chacon']
     p.email        = "chris@ozmm.org"
-    p.dependencies = ["text-format"]
+    p.dependencies = [
+      "text-format >=1.0.0",
+      "highline ~>1.5.1"
+    ]
   end
 
 rescue LoadError => boom

data/github.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{drnic-github}
-  s.version = "0.3.9"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Wanstrath, Kevin Ballard, Scott Chacon"]
-  s.date = %q{2009-11-04}
+  s.date = %q{2009-11-05}
   s.description = %q{The official `github` command line helper for simplifying your GitHub experience.}
   s.email = %q{chris@ozmm.org}
   s.executables = ["gh", "github"]
   s.extra_rdoc_files = ["LICENSE", "README", "bin/gh", "bin/github", "lib/commands/commands.rb", "lib/commands/helpers.rb", "lib/commands/issues.rb", "lib/commands/network.rb", "lib/github.rb", "lib/github/command.rb", "lib/github/extensions.rb", "lib/github/helper.rb", "lib/github/ui.rb"]
-  s.files = ["History.txt", "LICENSE", "Manifest", "README", "Rakefile", "bin/gh", "bin/github", "github.gemspec", "lib/commands/commands.rb", "lib/commands/helpers.rb", "lib/commands/issues.rb", "lib/commands/network.rb", "lib/github.rb", "lib/github/command.rb", "lib/github/extensions.rb", "lib/github/helper.rb", "lib/github/ui.rb", "setup.rb", "spec/command_spec.rb", "spec/extensions_spec.rb", "spec/github_spec.rb", "spec/helper_spec.rb", "spec/spec_helper.rb", "spec/ui_spec.rb", "spec/windoze_spec.rb"]
+  s.files = ["History.txt", "LICENSE", "Manifest", "README", "Rakefile", "bin/gh", "bin/github", "lib/commands/commands.rb", "lib/commands/helpers.rb", "lib/commands/issues.rb", "lib/commands/network.rb", "lib/github.rb", "lib/github/command.rb", "lib/github/extensions.rb", "lib/github/helper.rb", "lib/github/ui.rb", "setup.rb", "spec/command_spec.rb", "spec/commands/command_browse_spec.rb", "spec/commands/command_clone_spec.rb", "spec/commands/command_create-from-local_spec.rb", "spec/commands/command_fetch_spec.rb", "spec/commands/command_fork_spec.rb", "spec/commands/command_helper.rb", "spec/commands/command_home_spec.rb", "spec/commands/command_info_spec.rb", "spec/commands/command_network_spec.rb", "spec/commands/command_pull-request_spec.rb", "spec/commands/command_pull_spec.rb", "spec/commands/command_search_spec.rb", "spec/commands/command_track_spec.rb", "spec/commands_spec.rb", "spec/extensions_spec.rb", "spec/github_spec.rb", "spec/helper_spec.rb", "spec/spec_helper.rb", "spec/windoze_spec.rb", "github.gemspec"]
   s.homepage = %q{http://github.com/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Github", "--main", "README"]
   s.require_paths = ["lib"]
@@ -24,11 +24,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<text-format>, [">= 0"])
+      s.add_runtime_dependency(%q<text-format>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<highline>, ["~> 1.5.1"])
     else
-      s.add_dependency(%q<text-format>, [">= 0"])
+      s.add_dependency(%q<text-format>, [">= 1.0.0"])
+      s.add_dependency(%q<highline>, ["~> 1.5.1"])
     end
   else
-    s.add_dependency(%q<text-format>, [">= 0"])
+    s.add_dependency(%q<text-format>, [">= 1.0.0"])
+    s.add_dependency(%q<highline>, ["~> 1.5.1"])
   end
 end

data/lib/commands/commands.rb

@@ -37,7 +37,6 @@ command :open do |arg|
   helper.open "http://github.com/#{arg}"
 end
 
-
 desc "Info about this project."
 command :info do
   puts "== Info for #{helper.project}"
@@ -133,9 +132,12 @@ command :clone do |user, repo, dir|
     query = [user, repo, dir].compact.join(" ")
     data = JSON.parse(open("http://github.com/api/v1/json/search/#{URI.escape query}").read)
     if (repos = data['repositories']) && !repos.nil? && repos.length > 0
-      repos = repos.map { |r| "#{r['username']}/#{r['name']}"}.sort.uniq
-      if user_repo = GitHub::UI.display_select_list(repos)
-        user, repo = user_repo.split('/', 2)
+      repo_list = repos.map do |r|
+        { "name" => "#{r['username']}/#{r['name']}", "description" => r['description'] }
+      end
+      formatted_list = helper.format_list(repo_list).split("\n")
+      if user_repo = GitHub::UI.display_select_list(formatted_list)
+        user, repo = user_repo.strip.split('/', 2)
       end
     end
     die "Perhaps try another search" unless user && repo
@@ -159,7 +161,7 @@ end
 
 desc "Generate the text for a pull request."
 usage "github pull-request [user] [branch]"
-command 'pull-request' do |user, branch|
+command :'pull-request' do |user, branch|
   if helper.project
     die "Specify a user for the pull request" if user.nil?
     user, branch = user.split('/', 2) if branch.nil?
@@ -224,7 +226,7 @@ end
 
 desc "Create a new GitHub repository from the current local repository"
 flags :private => 'Create private repository'
-command 'create-from-local' do
+command :'create-from-local' do
   cwd = sh "pwd"
   repo = File.basename(cwd)
   is_repo = !git("status").match(/fatal/)

data/lib/commands/helpers.rb

@@ -454,6 +454,25 @@ helper :format_issue do |issue, options|
   report.join("\n")
 end
 
+# Converts an array of {"name" => "foo", "description" => "some description"} items
+# as a string list like:
+#   foo     # some description
+#   bar-tar # another description
+helper :format_list do |items|
+  longest_name = items.inject("") do |name, item|
+    name = item["name"] if item["name"] && item["name"].size > name.size
+    name
+  end
+  longest = longest_name.size + 1
+  lines = items.map do |item|
+    cmdstr = "%-#{longest}s" % item["name"]
+    if (description = item["description"]) && description.length > 0
+      cmdstr += "# #{description}"
+    end
+    cmdstr
+  end.join("\n")
+end
+
 helper :filter_issue do |issue, options|
   if options[:after] && ! options[:after].instance_of?(Time)
     options[:after] = Time.parse(options[:after]) rescue (puts 'cant parse after date')

data/lib/github/ui.rb

@@ -3,12 +3,17 @@ require "highline"
 module GitHub
   module UI
     extend self
+    # Take a list of items, including optional ' # some description' on each and
+    # return the selected item (without the description)
     def display_select_list(list)
       HighLine.track_eof = false
-      HighLine.new.choose do |menu|
-        list.each { |item| menu.choice item }
+      long_result = HighLine.new.choose do |menu|
+        list.each_with_index do |item, i|
+           menu.choice((i < 9) ? " #{item}" : item)
+        end
         menu.header = "Select a repository to clone"
       end
+      long_result && long_result.gsub(/\s+#.*$/,'').gsub(/^\ /,'')
     end
   end
 end

data/spec/commands/command_browse_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.dirname(__FILE__) + '/command_helper'
+
+describe "github browse" do
+  include CommandHelper
+  
+  specify "browse should open the project home page with the current branch" do
+    running :browse do
+      setup_url_for
+      setup_user_and_branch("user", "test-branch")
+      @helper.should_receive(:open).once.with("https://github.com/user/project/tree/test-branch")
+    end
+  end
+
+  specify "browse pending should open the project home page with the 'pending' branch" do
+    running :browse, "pending" do
+      setup_url_for
+      setup_user_and_branch("user", "test-branch")
+      @helper.should_receive(:open).once.with("https://github.com/user/project/tree/pending")
+    end
+  end
+
+  specify "browse defunkt pending should open the home page of defunkt's fork with the 'pending' branch" do
+    running :browse, "defunkt", "pending" do
+      setup_url_for
+      @helper.should_receive(:open).once.with("https://github.com/defunkt/project/tree/pending")
+    end
+  end
+
+  specify "browse defunkt/pending should open the home page of defunkt's fork with the 'pending' branch" do
+    running :browse, "defunkt/pending" do
+      setup_url_for
+      @helper.should_receive(:open).once.with("https://github.com/defunkt/project/tree/pending")
+    end
+  end
+end

data/spec/commands/command_clone_spec.rb

@@ -0,0 +1,87 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.dirname(__FILE__) + '/command_helper'
+
+describe "github clone" do
+  include CommandHelper
+  
+  # -- clone --
+  specify "clone should die with no args" do
+    running :clone do
+      @command.should_receive(:die).with("Specify a user to pull from").and_return { raise "Died" }
+      self.should raise_error(RuntimeError)
+    end
+  end
+
+  specify "clone should fall through with just one arg" do
+    running :clone, "git://git.kernel.org/linux.git" do
+      @command.should_receive(:git_exec).with("clone git://git.kernel.org/linux.git")
+    end
+  end
+
+  specify "clone defunkt github-gem should clone the repo" do
+    running :clone, "defunkt", "github-gem" do
+      @command.should_receive(:current_user?).and_return(nil)
+      @command.should_receive(:git_exec).with("clone git://github.com/defunkt/github-gem.git")
+    end
+  end
+
+  specify "clone defunkt/github-gem should clone the repo" do
+    running :clone, "defunkt/github-gem" do
+      @command.should_receive(:current_user?).and_return(nil)
+      @command.should_receive(:git_exec).with("clone git://github.com/defunkt/github-gem.git")
+    end
+  end
+
+  specify "clone --ssh defunkt github-gem should clone the repo using the private URL" do
+    running :clone, "--ssh", "defunkt", "github-gem" do
+      @command.should_receive(:git_exec).with("clone git@github.com:defunkt/github-gem.git")
+    end
+  end
+
+  specify "clone defunkt github-gem repo should clone the repo into the dir 'repo'" do
+    running :clone, "defunkt", "github-gem", "repo" do
+      @command.should_receive(:current_user?).and_return(nil)
+      @command.should_receive(:git_exec).with("clone git://github.com/defunkt/github-gem.git repo")
+    end
+  end
+
+  specify "clone defunkt/github-gem repo should clone the repo into the dir 'repo'" do
+    running :clone, "defunkt/github-gem", "repo" do
+      @command.should_receive(:current_user?).and_return(nil)
+      @command.should_receive(:git_exec).with("clone git://github.com/defunkt/github-gem.git repo")
+    end
+  end
+
+  specify "clone --ssh defunkt github-gem repo should clone the repo using the private URL into the dir 'repo'" do
+    running :clone, "--ssh", "defunkt", "github-gem", "repo" do
+      @command.should_receive(:git_exec).with("clone git@github.com:defunkt/github-gem.git repo")
+    end
+  end
+
+  specify "clone defunkt/github-gem repo should clone the repo into the dir 'repo'" do
+    running :clone, "defunkt/github-gem", "repo" do
+      @command.should_receive(:current_user?).and_return(nil)
+      @command.should_receive(:git_exec).with("clone git://github.com/defunkt/github-gem.git repo")
+    end
+  end
+  
+  specify "clone a selected repo after showing search results" do
+    running :clone, "--search", "github-gem" do
+      json = StringIO.new '{"repositories":[' +
+      '{"name":"github-gem","size":300,"followers":499,"username":"defunkt","language":"Ruby","fork":false,"id":"repo-1653","type":"repo","pushed":"2008-12-04T03:14:00Z","forks":59,"description":"The official `github` command line helper for simplifying your GitHub experience.","score":3.4152448,"created":"2008-02-28T09:35:34Z"},' +
+      '{"name":"github-gem-builder","size":76,"followers":26,"username":"pjhyett","language":"Ruby","fork":false,"id":"repo-67489","type":"repo","pushed":"2008-11-04T04:54:57Z","forks":3,"description":"The scripts used to build RubyGems on GitHub","score":3.4152448,"created":"2008-10-24T22:29:32Z"}' +
+      ']}'
+      json.rewind
+      question_list = <<-LIST.gsub(/^      /, '').split("\n").compact
+      defunkt/github-gem         # The official `github` command line helper for simplifying your GitHub experience.
+      pjhyett/github-gem-builder # The scripts used to build RubyGems on GitHub
+      LIST
+      @command.should_receive(:open).with("http://github.com/api/v1/json/search/github-gem").and_return(json)
+      GitHub::UI.should_receive(:display_select_list).with(question_list).
+        and_return("defunkt/github-gem")
+      @command.should_receive(:current_user?).and_return(nil)
+      @command.should_receive(:git_exec).with("clone git://github.com/defunkt/github-gem.git")
+    end
+  end
+  
+end

data/spec/commands/command_create-from-local_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.dirname(__FILE__) + '/command_helper'
+
+describe "github create-from-local" do
+  include CommandHelper
+  
+end

data/spec/commands/command_fetch_spec.rb

@@ -0,0 +1,56 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.dirname(__FILE__) + '/command_helper'
+
+describe "github fetch" do
+  include CommandHelper
+  
+  specify "fetch should die with no args" do
+    running :fetch do
+      @command.should_receive(:die).with("Specify a user to pull from").and_return { raise "Died" }
+      self.should raise_error(RuntimeError)
+    end
+  end
+
+  specify "fetch defunkt should start tracking defunkt if they're not already tracked" do
+    running :fetch, "defunkt" do
+      setup_remote(:origin, :user => "user", :ssh => true)
+      setup_remote(:external, :url => "home:/path/to/project.git")
+      GitHub.should_receive(:invoke).with(:track, "defunkt").and_return { raise "Tracked" }
+      self.should raise_error("Tracked")
+    end
+  end
+
+  specify "fetch defunkt should create defunkt/master and fetch from the defunkt remote" do
+    running :fetch, "defunkt" do
+      setup_remote(:defunkt)
+      @helper.should_receive(:branch_dirty?).and_return false
+      @command.should_receive(:git).with("fetch defunkt master:refs/remotes/defunkt/master").ordered
+      @command.should_receive(:git).with("update-ref refs/heads/defunkt/master refs/remotes/defunkt/master").ordered
+      @command.should_receive(:git_exec).with("checkout defunkt/master").ordered
+      stdout.should == "Fetching defunkt/master\n"
+    end
+  end
+
+  specify "fetch defunkt/wip should create defunkt/wip and fetch from wip branch on defunkt remote" do
+    running :fetch, "defunkt/wip" do
+      setup_remote(:defunkt, :remote_branches => ["master", "wip"])
+      @helper.should_receive(:branch_dirty?).and_return false
+      @command.should_receive(:git).with("fetch defunkt wip:refs/remotes/defunkt/wip").ordered
+      @command.should_receive(:git).with("update-ref refs/heads/defunkt/wip refs/remotes/defunkt/wip").ordered
+      @command.should_receive(:git_exec).with("checkout defunkt/wip").ordered
+      stdout.should == "Fetching defunkt/wip\n"
+    end
+  end
+
+  specify "fetch --merge defunkt should fetch from defunkt remote into current branch" do
+    running :fetch, "--merge", "defunkt" do
+      setup_remote(:defunkt)
+      @helper.should_receive(:branch_dirty?).and_return false
+      @command.should_receive(:git).with("fetch defunkt master:refs/remotes/defunkt/master").ordered
+      @command.should_receive(:git).with("update-ref refs/heads/defunkt/master refs/remotes/defunkt/master").ordered
+      @command.should_receive(:git_exec).with("checkout defunkt/master").ordered
+      stdout.should == "Fetching defunkt/master\n"
+    end
+  end
+
+end

data/spec/commands/command_fork_spec.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.dirname(__FILE__) + '/command_helper'
+
+describe "github fork" do
+  include CommandHelper
+  
+  specify "fork should print out help" do
+    running :fork do
+      @helper.should_receive(:remotes).and_return({})
+      @command.should_receive(:die).with("Specify a user/project to fork, or run from within a repo").and_return { raise "Died" }
+      self.should raise_error(RuntimeError)
+    end
+  end
+  
+  specify "fork this repo should create github fork and replace origin remote" do
+    running :fork do
+      setup_github_token
+      setup_url_for "origin", "defunkt", "github-gem"
+      setup_remote "origin", :user => "defunkt", :project => "github-gem"
+      setup_user_and_branch
+      @command.should_receive(:sh).with("curl -F 'login=drnic' -F 'token=MY_GITHUB_TOKEN' http://github.com/defunkt/github-gem/fork")
+      @command.should_receive(:git, "config remote.origin.url git@github.com/drnic/github-gem.git")
+      stdout.should == "defunkt/github-gem forked\n"
+    end
+  end
+
+  specify "fork a user/project repo" do
+    running :fork, "defunkt/github-gem" do
+      setup_github_token
+      @command.should_receive(:sh).with("curl -F 'login=drnic' -F 'token=MY_GITHUB_TOKEN' http://github.com/defunkt/github-gem/fork")
+      @command.should_receive(:git_exec, "clone git://github.com/defunkt/github-gem.git")
+      stdout.should == "Giving GitHub a moment to create the fork...\n"
+    end
+  end
+
+  specify "fork a user project repo" do
+    running :fork, "defunkt", "github-gem" do
+      setup_github_token
+      @command.should_receive("sh").with("curl -F 'login=drnic' -F 'token=MY_GITHUB_TOKEN' http://github.com/defunkt/github-gem/fork")
+      @command.should_receive(:git_exec, "clone git://github.com/defunkt/github-gem.git")
+      stdout.should == "Giving GitHub a moment to create the fork...\n"
+    end
+  end
+end

data/spec/commands/command_helper.rb

@@ -0,0 +1,170 @@
+module CommandHelper
+  def running(cmd, *args, &block)
+    Runner.new(self, cmd, *args, &block).run
+  end
+
+  class Runner
+    include SetupMethods
+
+    def initialize(parent, cmd, *args, &block)
+      @cmd_name = cmd.to_s
+      @command = GitHub.find_command(cmd)
+      @helper = @command.helper
+      @args = args
+      @block = block
+      @parent = parent
+    end
+
+    def run
+      self.instance_eval &@block
+      mock_remotes unless @remotes.nil?
+      GitHub.should_receive(:load).with(GitHub::BasePath + "/commands/commands.rb")
+      GitHub.should_receive(:load).with(GitHub::BasePath + "/commands/helpers.rb")
+      GitHub.should_receive(:load).with(GitHub::BasePath + "/commands/network.rb")
+      GitHub.should_receive(:load).with(GitHub::BasePath + "/commands/issues.rb")
+      args = @args.clone
+      GitHub.parse_options(args) # strip out the flags
+      GitHub.should_receive(:invoke).with(@cmd_name, *args).and_return do
+        GitHub.send(GitHub.send(:__mock_proxy).send(:munge, :invoke), @cmd_name, *args)
+      end
+      invoke = lambda { GitHub.activate([@cmd_name, *@args]) }
+      if @expected_result
+        expectation, result = @expected_result
+        case result
+        when Spec::Matchers::RaiseError, Spec::Matchers::Change, Spec::Matchers::ThrowSymbol
+          invoke.send expectation, result
+        else
+          invoke.call.send expectation, result
+        end
+      else
+        invoke.call
+      end
+      @stdout_mock.invoke unless @stdout_mock.nil?
+      @stderr_mock.invoke unless @stderr_mock.nil?
+    end
+
+    def setup_remote(remote, options = {:user => nil, :project => "project", :remote_branches => nil})
+      @remotes ||= {}
+      @remote_branches ||= {}
+      user = options[:user] || remote
+      project = options[:project]
+      ssh = options[:ssh]
+      url = options[:url]
+      remote_branches = options[:remote_branches] || ["master"]
+      if url
+        @remotes[remote] = url
+      elsif ssh
+        @remotes[remote] = "git@github.com:#{user}/#{project}.git"
+      else
+        @remotes[remote] = "git://github.com/#{user}/#{project}.git"
+      end
+
+      @remote_branches[remote] = (@remote_branches[remote] || Array.new) | remote_branches
+      @helper.should_receive(:remote_branch?).any_number_of_times.and_return do |remote, branch|
+        @remote_branches.fetch(remote.to_sym,[]).include?(branch)
+      end
+    end
+
+    def mock_remotes()
+      @helper.should_receive(:remotes).any_number_of_times.and_return(@remotes)
+    end
+
+    def mock_members(members)
+      @helper.should_receive(:network_members).any_number_of_times.and_return(members)
+    end
+
+    def should(result)
+      @expected_result = [:should, result]
+    end
+
+    def should_not(result)
+      @expected_result = [:should_not, result]
+    end
+
+    def stdout
+      if @stdout_mock.nil?
+        output = ""
+        @stdout_mock = DeferredMock.new(output)
+        $stdout.should_receive(:write).any_number_of_times do |str|
+          output << str
+        end
+      end
+      @stdout_mock
+    end
+
+    def stderr
+      if @stderr_mock.nil?
+        output = ""
+        @stderr_mock = DeferredMock.new(output)
+        $stderr.should_receive(:write).any_number_of_times do |str|
+          output << str
+        end
+      end
+      @stderr_mock
+    end
+
+    class DeferredMock
+      def initialize(obj = nil)
+        @obj = obj
+        @calls = []
+        @expectations = []
+      end
+
+      attr_reader :obj
+
+      def invoke(obj = nil)
+        obj ||= @obj
+        @calls.each do |sym, args|
+          obj.send sym, *args
+        end
+        @expectations.each do |exp|
+          exp.invoke
+        end
+      end
+
+      def should(*args)
+        if args.empty?
+          exp = Expectation.new(self, :should)
+          @expectations << exp
+          exp
+        else
+          @calls << [:should, args]
+        end
+      end
+
+      def should_not(*args)
+        if args.empty?
+          exp = Expectation.new(self, :should_not)
+          @expectations << exp
+          exp
+        else
+          @calls << [:should_not, args]
+        end
+      end
+
+      class Expectation
+        def initialize(mock, call)
+          @mock = mock
+          @call = call
+          @calls = []
+        end
+
+        undef_method *(instance_methods.map { |x| x.to_sym } - [:__id__, :__send__])
+
+        def invoke
+          @calls.each do |sym, args|
+            (@mock.obj.send @call).send sym, *args
+          end
+        end
+
+        def method_missing(sym, *args)
+          @calls << [sym, args]
+        end
+      end
+    end
+
+    def method_missing(sym, *args)
+      @parent.send sym, *args
+    end
+  end
+end