jruby-on-hadoop 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/build.xml

@@ -11,6 +11,7 @@
 
 	<property environment="env" />
 	<property name="hadoop.home" value="${env.HADOOP_HOME}" />
+	<property name="jruby.home" value="${env.JRUBY_HOME}" />
 
 	<property name="version" value="0.0.2" />
 	<property name="src.dir" value="${basedir}/src/java" />
@@ -19,6 +20,8 @@
 
 	<property name="hadoop.version" value="0.19.2" />
 	<property name="hadoop.jar" value="${hadoop.home}/hadoop-${hadoop.version}-core.jar" />
+	
+	<property name="jruby.jar" value="jruby.jar" />
 
 	<target name="jar" depends="clean,compile">
 		<mkdir dir="${dist.dir}" />
@@ -42,6 +45,9 @@
 					<include name="*.jar" />
 					<include name="lib/*.jar" />
 				</fileset>
+				<fileset dir="${jruby.home}">
+					<include name="lib/${jruby.jar}" />
+				</fileset>
 			</classpath>
 		</javac>
 	</target>

data/jruby-on-hadoop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-on-hadoop}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-28}
   s.default_executable = %q{joh}
   s.description = %q{JRuby on Hadoop}
   s.email = %q{fujibee@gmail.com}

data/lib/jruby-on-hadoop/client.rb

@@ -13,15 +13,13 @@ module JRubyOnHadoop
     end
 
     def hadoop_home
-      home = ENV['HADOOP_HOME']
-      raise 'HADOOP_HOME is not set' if home.nil? or home.empty?
-      home
+      ENV['HADOOP_HOME']
     end
 
     def hadoop_cmd
       hadoop = `which hadoop 2>/dev/null`
-      hadoop = "#{hadoop_home}/bin/hadoop" if hadoop.nil? or hadoop.empty?
-      raise 'cannot find hadoop command' unless hadoop
+      hadoop = "#{hadoop_home}/bin/hadoop" if hadoop.empty? and (!hadoop_home.empty?)
+      raise 'cannot find hadoop command' if hadoop.empty?
       hadoop.chomp
     end
 

data/spec/jruby-on-hadoop/client_spec.rb

@@ -36,11 +36,11 @@ describe JRubyOnHadoop::Client do
     client.files.should include 'examples/mapred.rb'
   end
 
-  it 'should raise error if HADOOP_HOME env is not set' do
+  it 'should not raise error if HADOOP_HOME env is not set' do
     saved = ENV['HADOOP_HOME']
     ENV['HADOOP_HOME'] = ''
     begin
-      lambda { JRubyOnHadoop::Client.new }.should raise_error
+      lambda { JRubyOnHadoop::Client.new }.should_not raise_error
     ensure
       ENV['HADOOP_HOME'] = saved
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-on-hadoop
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Koichi Fujikawa
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +09:00
+date: 2010-01-28 00:00:00 +09:00
 default_executable: joh
 dependencies: 
 - !ruby/object:Gem::Dependency