Skip to content

Commit

Permalink
Merge "Bump wukong and fix failing specs Bump version to 0.2.0"
Browse files Browse the repository at this point in the history
  • Loading branch information
Travis Dempsey authored and Gerrit Code Review committed Mar 19, 2014
2 parents 5057b23 + 358943c commit c49bf7a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,4 +1,4 @@
source :rubygems
source 'https://rubygems.org'

gemspec

Expand Down
2 changes: 1 addition & 1 deletion lib/wukong-hadoop/version.rb
@@ -1,5 +1,5 @@
module Wukong
module Hadoop
VERSION = '0.1.1'
VERSION = '0.2.0'
end
end
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Expand Up @@ -21,7 +21,7 @@ def root

def hadoop_runner *args, &block
runner(Wukong::Hadoop::HadoopRunner, 'wu-hadoop', *args) do
stub!(:execute_command)
stub(:execute_command)
instance_eval(&block) if block_given?
end
end
Expand Down
6 changes: 3 additions & 3 deletions spec/wukong-hadoop/hadoop_mode_spec.rb
Expand Up @@ -69,13 +69,13 @@
context "removing existing output paths" do

it "will not remove the output path by default" do
hadoop_runner('regexp', 'count', input: '/tmp/input1,/tmp/input2', output: '/tmp/output') { should_not_receive(:remove_output_path!) }
hadoop_runner('regexp', 'count', input: '/tmp/input1,/tmp/input2', output: '/tmp/output') { should_not_receive(:remove_output_path) }
end
it "will remove the output path when given the --rm option" do
hadoop_runner('regexp', 'count', input: '/tmp/input1,/tmp/input2', output: '/tmp/output', rm: true) { should_receive(:remove_output_path!) }
hadoop_runner('regexp', 'count', input: '/tmp/input1,/tmp/input2', output: '/tmp/output', rm: true) { should_receive(:remove_output_path) }
end
it "will not remove the output path when given the --rm option AND the --dry_run option" do
hadoop_runner('regexp', 'count', input: '/tmp/input1,/tmp/input2', output: '/tmp/output', rm: true, dry_run: true) { should_receive(:remove_output_path!) }
hadoop_runner('regexp', 'count', input: '/tmp/input1,/tmp/input2', output: '/tmp/output', rm: true, dry_run: true) { should_receive(:remove_output_path) }
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/wukong-hadoop/runner_spec.rb
Expand Up @@ -4,7 +4,7 @@

context "handling errors" do
it "raises an error when it can't find a file" do
expect { hadoop_runner(examples_dir('processors.rb'), examples_dir('doesnt_exist.rb'), :input => 'foo', :output => 'bar') }.to raise_error(Wukong::Error, /no such file/)
expect { hadoop_runner(examples_dir('processors.rb'), examples_dir('doesnt_exist.rb'), :input => 'foo', :output => 'bar') }.to raise_error(Wukong::Error, /cannot load such file/)
end

it "raises an error in Hadoop mode when called without input and output paths" do
Expand Down
2 changes: 1 addition & 1 deletion wukong-hadoop.gemspec
Expand Up @@ -25,5 +25,5 @@ EOF
gem.test_files = gem.files.grep(/^spec/)
gem.require_paths = ['lib']

gem.add_dependency('wukong', '3.0.1')
gem.add_dependency('wukong', '4.0.0')
end

0 comments on commit c49bf7a

Please sign in to comment.