Permalink
Browse files

Merge pull request #12 from codenamev/bundler-for-dependencies

Use bundler to manage dependencies and gem releases
  • Loading branch information...
2 parents e6c8545 + 0003952 commit 96ed50e5c9c27ae3daa055d6d4f600df67f4e66e @kenpratt committed Oct 16, 2013
Showing with 109 additions and 85 deletions.
  1. +2 −0 Gemfile
  2. +71 −0 Gemfile.lock
  3. +3 −18 Rakefile
  4. +0 −1 VERSION
  5. +3 −0 lib/wikipedia/version.rb
  6. +1 −1 spec/lib/wikipedia_spec.rb
  7. +29 −65 wikipedia-client.gemspec
View
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec
View
@@ -0,0 +1,71 @@
+PATH
+ remote: .
+ specs:
+ wikipedia-client (1.3.1)
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ addressable (2.3.5)
+ builder (3.2.2)
+ diff-lcs (1.2.4)
+ faraday (0.8.8)
+ multipart-post (~> 1.2.0)
+ git (1.2.6)
+ github_api (0.10.1)
+ addressable
+ faraday (~> 0.8.1)
+ hashie (>= 1.2)
+ multi_json (~> 1.4)
+ nokogiri (~> 1.5.2)
+ oauth2
+ hashie (2.0.5)
+ highline (1.6.19)
+ httpauth (0.2.0)
+ jeweler (1.8.8)
+ builder
+ bundler (~> 1.0)
+ git (>= 1.2.5)
+ github_api (= 0.10.1)
+ highline (>= 1.6.15)
+ nokogiri (= 1.5.10)
+ rake
+ rdoc
+ json (1.8.0)
+ jwt (0.1.8)
+ multi_json (>= 1.5)
+ multi_json (1.8.1)
+ multi_xml (0.5.5)
+ multipart-post (1.2.0)
+ nokogiri (1.5.10)
+ oauth2 (0.9.2)
+ faraday (~> 0.8)
+ httpauth (~> 0.2)
+ jwt (~> 0.1.4)
+ multi_json (~> 1.0)
+ multi_xml (~> 0.5)
+ rack (~> 1.2)
+ rack (1.5.2)
+ rake (10.1.0)
+ rdoc (4.0.1)
+ json (~> 1.4)
+ rspec (2.14.1)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ rspec-core (2.14.5)
+ rspec-expectations (2.14.3)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.14.3)
+ thoughtbot-shoulda (2.11.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ jeweler
+ rake
+ rdoc
+ rspec
+ thoughtbot-shoulda
+ wikipedia-client!
View
@@ -1,23 +1,7 @@
+$:.push File.expand_path("../lib", __FILE__)
require 'rubygems'
require 'rake'
-begin
- require 'jeweler'
- Jeweler::Tasks.new do |gem|
- gem.name = "wikipedia-client"
- gem.summary = %Q{Ruby client for the Wikipedia API}
- gem.description = %Q{Ruby client for the Wikipedia API}
- gem.email = "mike.haugland@gmail.com"
- gem.homepage = "http://github.com/mhaugland/wikipedia-client"
- gem.authors = ["Cyril David", "Ken Pratt", "Mike Haugland"]
- gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
- # 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 'rake/testtask'
Rake::TestTask.new(:test) do |test|
test.libs << 'lib' << 'test'
@@ -50,8 +34,9 @@ task :spec => :check_dependencies
task :default => :spec
require 'rdoc/task'
+require "wikipedia/version"
Rake::RDocTask.new do |rdoc|
- version = File.exist?('VERSION') ? File.read('VERSION') : ""
+ version = Wikipedia::VERSION
rdoc.rdoc_dir = 'rdoc'
rdoc.title = "wikipedia-client #{version}"
View
@@ -1 +0,0 @@
-1.3.0
View
@@ -0,0 +1,3 @@
+module Wikipedia
+ VERSION = "1.3.1"
+end
@@ -17,4 +17,4 @@
page2 = Wikipedia.find('http://en.wikipedia.org/wiki/Getting_Things_Done')
page1.title.should == page2.title
end
-end
+end
View
@@ -1,75 +1,40 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "wikipedia/version"
-Gem::Specification.new do |s|
- s.name = "wikipedia-client"
- s.version = "1.3.0"
+spec = Gem::Specification.new do |s|
+ s.name = "wikipedia-client"
+ s.version = Wikipedia::VERSION
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Cyril David", "Ken Pratt", "Mike Haugland"]
- s.date = "2013-06-30"
- s.description = "Ruby client for the Wikipedia API"
- s.email = "mike.haugland@gmail.com"
+
+ s.license = 'MIT'
+ s.authors = ["Cyril David", "Ken Pratt", "Mike Haugland"]
+ s.date = "2013-06-30"
+ s.description = "Ruby client for the Wikipedia API"
+ s.email = "mike.haugland@gmail.com"
s.extra_rdoc_files = [
"README.textile"
]
- s.files = [
- "MIT-LICENSE",
- "README.textile",
- "Rakefile",
- "VERSION",
- "init.rb",
- "install.rb",
- "lib/wikipedia.rb",
- "lib/wikipedia/client.rb",
- "lib/wikipedia/configuration.rb",
- "lib/wikipedia/page.rb",
- "lib/wikipedia/url.rb",
- "script/add_sanitization_test",
- "spec/fixtures/Edsger_Dijkstra.json",
- "spec/fixtures/Edsger_Dijkstra.yaml",
- "spec/fixtures/Edsger_Dijkstra_section_0.json",
- "spec/fixtures/Edsger_content.txt",
- "spec/fixtures/File_Edsger_Wybe_Dijkstra_jpg.json",
- "spec/fixtures/sanitization_samples/Ceawlin_of_Wessex-raw.txt",
- "spec/fixtures/sanitization_samples/Ceawlin_of_Wessex-sanitized.txt",
- "spec/fixtures/sanitization_samples/Edsger_W_Dijkstra-raw.txt",
- "spec/fixtures/sanitization_samples/Edsger_W_Dijkstra-sanitized.txt",
- "spec/fixtures/sanitization_samples/Flower_video_game-raw.txt",
- "spec/fixtures/sanitization_samples/Flower_video_game-sanitized.txt",
- "spec/fixtures/sanitization_samples/How_to_Lose_Friends__Alienate_People_film-raw.txt",
- "spec/fixtures/sanitization_samples/How_to_Lose_Friends__Alienate_People_film-sanitized.txt",
- "spec/fixtures/sanitization_samples/Kirsten_Dunst-raw.txt",
- "spec/fixtures/sanitization_samples/Kirsten_Dunst-sanitized.txt",
- "spec/fixtures/sanitization_samples/Large_Hadron_Collider-raw.txt",
- "spec/fixtures/sanitization_samples/Large_Hadron_Collider-sanitized.txt",
- "spec/fixtures/sanitization_samples/Metro_Goldwyn_Mayer-raw.txt",
- "spec/fixtures/sanitization_samples/Metro_Goldwyn_Mayer-sanitized.txt",
- "spec/fixtures/sanitization_samples/Middle_Ages-raw.txt",
- "spec/fixtures/sanitization_samples/Middle_Ages-sanitized.txt",
- "spec/fixtures/sanitization_samples/SMS_Elbing-raw.txt",
- "spec/fixtures/sanitization_samples/SMS_Elbing-sanitized.txt",
- "spec/fixtures/sanitization_samples/Sashimi-raw.txt",
- "spec/fixtures/sanitization_samples/Sashimi-sanitized.txt",
- "spec/fixtures/sanitization_samples/Superb_Fairywren-raw.txt",
- "spec/fixtures/sanitization_samples/Superb_Fairywren-sanitized.txt",
- "spec/fixtures/sanitization_samples/Velociraptor-raw.txt",
- "spec/fixtures/sanitization_samples/Velociraptor-sanitized.txt",
- "spec/lib/client_spec.rb",
- "spec/lib/sanitize_spec.rb",
- "spec/lib/url_spec.rb",
- "spec/lib/wikipedia_spec.rb",
- "spec/spec_helper.rb",
- "tasks/wikipedia_tasks.rake",
- "uninstall.rb",
- "wikipedia-client.gemspec"
- ]
- s.homepage = "http://github.com/mhaugland/wikipedia-client"
- s.require_paths = ["lib"]
+
+ s.homepage = "http://github.com/mhaugland/wikipedia-client"
s.rubygems_version = "1.8.23"
- s.summary = "Ruby client for the Wikipedia API"
+ s.summary = "Ruby client for the Wikipedia API"
+ s.platform = Gem::Platform::RUBY
+ s.files = `git ls-files`.split("\n")
+ s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+ s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+ s.has_rdoc = true
+ s.extra_rdoc_files = ['README.rdoc']
+ s.bindir = 'bin'
+
+ s.require_paths << 'lib'
+ s.rdoc_options << '--title' << 'wikipedia-client' << '--main' << 'README.rdoc' << '-ri'
+
+ s.add_development_dependency('rake')
+ s.add_development_dependency('rspec')
+ s.add_development_dependency('rdoc')
+ s.add_development_dependency('jeweler')
if s.respond_to? :specification_version then
s.specification_version = 3
@@ -83,4 +48,3 @@ Gem::Specification.new do |s|
s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
end
end
-

0 comments on commit 96ed50e

Please sign in to comment.