diff --git a/.gitignore b/.gitignore index c1e0daf..271ec02 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,7 @@ tmtags coverage rdoc pkg +Gemfile.lock +ungulate-*.gem ## PROJECT::SPECIFIC diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..817f62a --- /dev/null +++ b/Gemfile @@ -0,0 +1,2 @@ +source 'http://rubygems.org' +gemspec diff --git a/README.rdoc b/README.rdoc index fd1d619..38d7cdd 100644 --- a/README.rdoc +++ b/README.rdoc @@ -28,4 +28,4 @@ http://wiki.github.com/camelpunch/ungulate/ == Copyright -Copyright (c) 2010 Camel Punch Limited. See LICENSE for details. +Copyright (c) 2011 Camel Punch Limited. See LICENSE for details. diff --git a/Rakefile b/Rakefile index 7e09953..848afb3 100644 --- a/Rakefile +++ b/Rakefile @@ -1,41 +1,11 @@ require 'rubygems' require 'rake' -begin - require 'jeweler' - Jeweler::Tasks.new do |gem| - gem.name = "ungulate" - gem.summary = %Q{Process images using Amazon SQS and S3} - gem.description = %Q{WIP} - gem.email = "andrew@camelpunch.com" - gem.homepage = "http://github.com/camelpunch/ungulate" - gem.authors = ["Andrew Bruce"] - gem.add_dependency "activesupport", ">= 2.3.5" - gem.add_dependency "right_aws", ">= 2.0.0" - gem.add_dependency "rmagick", ">= 2.13.1" - gem.add_dependency "mime-types", ">= 1.16" - gem.add_development_dependency "rspec", ">= 1.3.0" - gem.add_development_dependency "cucumber", ">= 0.8.1" - # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings - end - Jeweler::GemcutterTasks.new -rescue LoadError - puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler" -end - -require 'spec/rake/spectask' -Spec::Rake::SpecTask.new(:spec) do |spec| - spec.libs << 'lib' << 'spec' - spec.spec_files = FileList['spec/**/*_spec.rb'] -end - -Spec::Rake::SpecTask.new(:rcov) do |spec| - spec.libs << 'lib' << 'spec' - spec.pattern = 'spec/**/*_spec.rb' - spec.rcov = true -end +require 'rspec/core/rake_task' +RSpec::Core::RakeTask.new(:spec) -task :spec => :check_dependencies +require 'cucumber/rake/task' +Cucumber::Rake::Task.new task :default => :spec diff --git a/features/step_definitions/command_steps.rb b/features/step_definitions/command_steps.rb index 845d9ca..adcb9a5 100644 --- a/features/step_definitions/command_steps.rb +++ b/features/step_definitions/command_steps.rb @@ -1,3 +1,5 @@ +require 'ostruct' + When /^I run Ungulate$/ do @errors = OpenStruct.new :write => '' $stderr = @errors diff --git a/features/support.rb b/features/support.rb index 3604779..ddfb298 100644 --- a/features/support.rb +++ b/features/support.rb @@ -1,3 +1,2 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) require 'lib/ungulate' -require 'ruby-debug' diff --git a/lib/ungulate/file_upload.rb b/lib/ungulate/file_upload.rb index ac3560c..02b17d8 100644 --- a/lib/ungulate/file_upload.rb +++ b/lib/ungulate/file_upload.rb @@ -1,4 +1,4 @@ -require 'active_support/all' +require 'active_support/core_ext/class/attribute_accessors' class Ungulate::FileUpload attr_accessor( :bucket_url, diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c204410..a58de31 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,9 +1,3 @@ -$LOAD_PATH.unshift(File.dirname(__FILE__)) -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) require 'ungulate' -require 'spec' -require 'spec/autorun' +require 'rspec' -Spec::Runner.configure do |config| - -end diff --git a/spec/ungulate/view_helpers_spec.rb b/spec/ungulate/view_helpers_spec.rb index ea28423..b9d2286 100644 --- a/spec/ungulate/view_helpers_spec.rb +++ b/spec/ungulate/view_helpers_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'ungulate/view_helpers' -require 'active_support/all' +require 'active_support/core_ext' class Rails2Includer include ViewHelpers diff --git a/ungulate.gemspec b/ungulate.gemspec index fd75d22..95eb04a 100644 --- a/ungulate.gemspec +++ b/ungulate.gemspec @@ -1,90 +1,48 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command -# -*- encoding: utf-8 -*- +Gem::Specification.new do |gem| + gem.name = 'ungulate' + gem.version = File.read('VERSION') -Gem::Specification.new do |s| - s.name = %q{ungulate} - s.version = "0.0.15" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Andrew Bruce"] - s.date = %q{2010-12-05} - s.default_executable = %q{ungulate_server.rb} - s.description = %q{WIP} - s.email = %q{andrew@camelpunch.com} - s.executables = ["ungulate_server.rb"] - s.extra_rdoc_files = [ + gem.authors = ["Andrew Bruce"] + gem.date = Date.today.to_s + gem.default_executable = 'ungulate_server.rb' + gem.description = File.read('README.rdoc') + gem.email = 'andrew@camelpunch.com' + gem.executables = ["ungulate_server.rb"] + gem.extra_rdoc_files = [ "LICENSE", - "README.rdoc" + "README.rdoc" ] - s.files = [ + gem.files = Dir[ ".document", - ".gitignore", - "LICENSE", - "README.rdoc", - "Rakefile", - "VERSION", - "bin/ungulate_server.rb", - "features/camels.jpg", - "features/cope_with_empty_queue.feature", - "features/image_resize.feature", - "features/step_definitions/command_steps.rb", - "features/step_definitions/queue_steps.rb", - "features/step_definitions/version_steps.rb", - "features/support.rb", - "lib/ungulate.rb", - "lib/ungulate/file_upload.rb", - "lib/ungulate/job.rb", - "lib/ungulate/server.rb", - "lib/ungulate/view_helpers.rb", - "spec/spec.opts", - "spec/spec_helper.rb", - "spec/ungulate/file_upload_spec.rb", - "spec/ungulate/job_spec.rb", - "spec/ungulate/server_spec.rb", - "spec/ungulate/view_helpers_spec.rb", - "ungulate.gemspec" + ".gitignore", + "LICENSE", + "README.rdoc", + "Rakefile", + "VERSION", + "bin/*", + "features/**/*", + "lib/**/*", + "spec/**/*", ] - s.homepage = %q{http://github.com/camelpunch/ungulate} - s.rdoc_options = ["--charset=UTF-8"] - s.require_paths = ["lib"] - s.rubygems_version = %q{1.3.7} - s.summary = %q{Process images using Amazon SQS and S3} - s.test_files = [ + gem.homepage = 'http://github.com/camelpunch/ungulate' + gem.rdoc_options = ["--charset=UTF-8"] + gem.require_paths = ["lib"] + gem.summary = 'Process images using Amazon SQS and S3' + gem.test_files = [ "spec/spec_helper.rb", - "spec/ungulate/file_upload_spec.rb", - "spec/ungulate/job_spec.rb", - "spec/ungulate/server_spec.rb", - "spec/ungulate/view_helpers_spec.rb" + "spec/ungulate/file_upload_spec.rb", + "spec/ungulate/job_spec.rb", + "spec/ungulate/server_spec.rb", + "spec/ungulate/view_helpers_spec.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, [">= 2.3.5"]) - s.add_runtime_dependency(%q, [">= 2.0.0"]) - s.add_runtime_dependency(%q, [">= 2.13.1"]) - s.add_runtime_dependency(%q, [">= 1.16"]) - s.add_development_dependency(%q, [">= 1.3.0"]) - s.add_development_dependency(%q, [">= 0.8.1"]) - else - s.add_dependency(%q, [">= 2.3.5"]) - s.add_dependency(%q, [">= 2.0.0"]) - s.add_dependency(%q, [">= 2.13.1"]) - s.add_dependency(%q, [">= 1.16"]) - s.add_dependency(%q, [">= 1.3.0"]) - s.add_dependency(%q, [">= 0.8.1"]) - end - else - s.add_dependency(%q, [">= 2.3.5"]) - s.add_dependency(%q, [">= 2.0.0"]) - s.add_dependency(%q, [">= 2.13.1"]) - s.add_dependency(%q, [">= 1.16"]) - s.add_dependency(%q, [">= 1.3.0"]) - s.add_dependency(%q, [">= 0.8.1"]) - end + gem.add_runtime_dependency('activesupport', [">= 2.3.5"]) + gem.add_runtime_dependency('right_aws', [">= 2.0.0"]) + gem.add_runtime_dependency('rmagick', [">= 2.13.1"]) + gem.add_runtime_dependency('mime-types', [">= 1.16"]) + gem.add_development_dependency('rake') + gem.add_development_dependency('rspec', [">= 2.4.0"]) + gem.add_development_dependency('cucumber', [">= 0.10.0"]) + gem.add_development_dependency('i18n', [">= 0.5.0"]) end