Skip to content
This repository has been archived by the owner on Dec 18, 2019. It is now read-only.

Commit

Permalink
Remove the majority of unnecessary code in the gem, mostly in tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Walker committed Aug 9, 2012
1 parent 5f552f2 commit 03bac97
Show file tree
Hide file tree
Showing 25 changed files with 56 additions and 1,094 deletions.
10 changes: 1 addition & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
.bnsignore
.hg
.hgignore
build
input
out
output
*.iml
*.ipr
*.iws
classes/
.classpath
.project
pkg/
tags
*.gem
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

It requires Hadoop (>= 0.20.2) and [Cascading 2.0.0](http://files.cascading.org/cascading/2.0/cascading-2.0.0.tgz) to be set via the environment variables: `HADOOP_HOME` and `CASCADING_HOME`

It has been tested on JRuby versions 1.2.0, 1.4.0, 1.5.3, and 1.6.5.

Copyright 2009, Grégoire Marabout.
It has been tested on JRuby versions 1.2.0, 1.4.0, 1.5.3, 1.6.5, and 1.6.7.2.
48 changes: 9 additions & 39 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,47 +1,17 @@
# encoding: UTF-8
#! /usr/bin/env jruby
$: << 'lib'

# Look in the tasks/setup.rb file for the various options that can be
# configured in this Rakefile. The .rake files in the tasks directory
# are where the options are used.

begin
require 'bones'
Bones.setup
rescue LoadError
begin
load 'tasks/setup.rb'
rescue LoadError
raise RuntimeError, '### please install the "bones" gem ###'
end
end

ensure_in_path 'lib'

require 'cascading'
require 'bundler/setup'
require 'cascading'

task :default => 'test'
load 'tasks/ant.rake'
load 'tasks/test.rake'
load 'tasks/spec.rake'
load 'tasks/samples.rake'
load 'tasks/git.rake'

task :run do
# ensure_in_path "samples"
puts "Running #{ARGS[0]}"
require "samples/#{ARGS[0]}"
end
task :default => 'test'

desc 'Remove gem and Java build files'
task :clean => ['ant:clean', 'gem:clean', 'samples:clean'] do
task :clean => ['ant:clean', 'samples:clean'] do
puts 'Build files removed'
end

PROJ.name = 'cascading.jruby'
PROJ.authors = ['Matt Walker', 'Grégoire Marabout']
PROJ.email = 'mwalker@etsy.com'
PROJ.url = 'http://github.com/etsy/cascading.jruby'
PROJ.version = Cascading::VERSION
PROJ.summary = 'A JRuby DSL for Cascading'
PROJ.description = 'cascading.jruby is a small DSL above Cascading, written in JRuby'
PROJ.rubyforge.name = 'cascading.jruby'
PROJ.spec.opts << '--color'

# EOF
81 changes: 0 additions & 81 deletions bin/make_job

This file was deleted.

25 changes: 25 additions & 0 deletions cascading.jruby.gemspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# -*- encoding: utf-8 -*-

Gem::Specification.new do |s|
s.name = "cascading.jruby"
s.version = "0.0.9"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Matt Walker", "Gr\303\251goire Marabout"]
s.date = "2012-08-09"
s.description = "cascading.jruby is a small DSL above Cascading, written in JRuby"
s.email = "mwalker@etsy.com"
s.extra_rdoc_files = ["History.txt", "LICENSE.txt"]
s.files = ["lib/cascading.rb", "lib/cascading/aggregations.rb", "lib/cascading/assembly.rb", "lib/cascading/base.rb", "lib/cascading/cascade.rb", "lib/cascading/cascading.rb", "lib/cascading/cascading_exception.rb", "lib/cascading/expr_stub.rb", "lib/cascading/ext/array.rb", "lib/cascading/flow.rb", "lib/cascading/mode.rb", "lib/cascading/operations.rb", "lib/cascading/scope.rb", "lib/cascading/sub_assembly.rb", "lib/cascading/tap.rb"]
s.homepage = "http://github.com/etsy/cascading.jruby"
s.rdoc_options = ["--main", "README.md"]
s.require_paths = ["lib"]
s.rubyforge_project = "cascading.jruby"
s.rubygems_version = "1.8.21"
s.summary = "A JRuby DSL for Cascading"
s.test_files = ["test/test_aggregations.rb", "test/test_assembly.rb", "test/test_cascade.rb", "test/test_cascading.rb", "test/test_exceptions.rb", "test/test_flow.rb", "test/test_local_execution.rb", "test/test_operations.rb"]

if s.respond_to? :specification_version then
s.specification_version = 3
end
end
4 changes: 0 additions & 4 deletions lib/cascading.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Copyright 2009, Grégoire Marabout. All Rights Reserved.
#
# This is free software. Please see the LICENSE and COPYING files for details.

require 'java'

module Cascading
Expand Down
5 changes: 0 additions & 5 deletions lib/cascading/assembly.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2009, Grégoire Marabout. All Rights Reserved.
#
# This is free software. Please see the LICENSE and COPYING files for details.

require 'cascading/base'
require 'cascading/operations'
require 'cascading/aggregations'
Expand Down
4 changes: 0 additions & 4 deletions lib/cascading/base.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Copyright 2009, Grégoire Marabout. All Rights Reserved.
#
# This is free software. Please see the LICENSE and COPYING files for details.

module Cascading
class Node
attr_accessor :name, :parent, :children, :child_names, :last_child
Expand Down
4 changes: 0 additions & 4 deletions lib/cascading/cascade.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Copyright 2009, Grégoire Marabout. All Rights Reserved.
#
# This is free software. Please see the LICENSE and COPYING files for details.

require 'cascading/base'
require 'yaml'

Expand Down
5 changes: 0 additions & 5 deletions lib/cascading/cascading.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2009, Grégoire Marabout. All Rights Reserved.
#
# This is free software. Please see the LICENSE and COPYING files for details.

require 'cascading/expr_stub'

module Cascading
Expand Down
8 changes: 1 addition & 7 deletions lib/cascading/ext/array.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# ext.rb : some extensions to basic types
#
# Copyright 2009, Grégoire Marabout. All Rights Reserved.
#
# This is free software. Please see the LICENSE and COPYING files for details.

class Array
def extract_options!
last.is_a?(::Hash) ? pop : {}
Expand All @@ -12,4 +6,4 @@ def extract_options!
def extract_options
last.is_a?(::Hash) ? last : {}
end
end
end
5 changes: 0 additions & 5 deletions lib/cascading/flow.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2009, Grégoire Marabout. All Rights Reserved.
#
# This is free software. Please see the LICENSE and COPYING files for details.

require 'cascading/assembly'

module Cascading
Expand Down
4 changes: 0 additions & 4 deletions lib/cascading/operations.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Copyright 2009, Grégoire Marabout. All Rights Reserved.
#
# This is free software. Please see the LICENSE and COPYING files for details.

module Cascading
module Operations
def identity
Expand Down
80 changes: 0 additions & 80 deletions tasks/ann.rake

This file was deleted.

20 changes: 0 additions & 20 deletions tasks/bones.rake

This file was deleted.

Loading

0 comments on commit 03bac97

Please sign in to comment.