Skip to content

Commit

Permalink
Upgrade to dev ruby 2.3.1, from jeweler to juwelier.
Browse files Browse the repository at this point in the history
  • Loading branch information
freerobby committed Sep 2, 2016
1 parent 15f244f commit 5727f65
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.3-p547
2.3.1
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ source 'http://rubygems.org'
# Add dependencies to develop your gem here.
# Include everything needed to run rake, tests, features, etc.
group :development do
gem 'iconv'
gem 'bundler', '~> 1.2'
gem 'fakeweb', '~> 1.3'
gem 'jeweler', '~> 1.8'
gem 'juwelier'
gem 'simplecov', :require => false
gem 'rspec', '~> 2.12'
end
Expand Down
50 changes: 45 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,53 @@
GEM
remote: http://rubygems.org/
specs:
addressable (2.4.0)
builder (3.2.2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
fakeweb (1.3.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
git (1.3.0)
jeweler (1.8.4)
bundler (~> 1.0)
github_api (0.14.5)
addressable (~> 2.4.0)
descendants_tracker (~> 0.0.4)
faraday (~> 0.8, < 0.10)
hashie (>= 3.4)
oauth2 (~> 1.0)
hashie (3.4.4)
highline (1.7.8)
iconv (1.0.4)
json (1.8.3)
json (1.8.3-java)
juwelier (2.1.2)
builder
bundler (>= 1.0)
git (>= 1.2.5)
github_api
highline (>= 1.6.15)
nokogiri (>= 1.5.10)
rake
rdoc
json (1.8.3)
json (1.8.3-java)
semver
jwt (1.5.4)
mini_portile2 (2.1.0)
multi_json (1.8.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
nokogiri (1.6.8-java)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
pkg-config (1.1.7)
rack (2.0.1)
rake (11.2.2)
rdoc (4.2.2)
json (~> 1.4)
Expand All @@ -23,10 +59,13 @@ GEM
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
semver (1.0.1)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
thread_safe (0.3.5)
thread_safe (0.3.5-java)

PLATFORMS
java
Expand All @@ -35,7 +74,8 @@ PLATFORMS
DEPENDENCIES
bundler (~> 1.2)
fakeweb (~> 1.3)
jeweler (~> 1.8)
iconv
juwelier
rspec (~> 2.12)
simplecov

Expand Down
14 changes: 9 additions & 5 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# encoding: utf-8

require 'rubygems'
require 'bundler'
begin
Expand All @@ -9,18 +11,20 @@ rescue Bundler::BundlerError => e
end
require 'rake'

require 'jeweler'
Jeweler::Tasks.new do |gem|
# gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
require 'juwelier'
Juwelier::Tasks.new do |gem|
# gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
gem.name = 'wistia-api'
gem.homepage = 'http://github.com/wistia/wistia-api'
gem.license = 'MIT'
gem.summary = 'Ruby wrapper for Wistia\'s API'
gem.description = 'A ruby library for working with Wistia\'s data API.'
gem.email = 'support@wistia.com'
gem.authors = ['Jeff Vincent', 'Jim Bancroft', 'Mark Bates', 'Robby Grossman']

# dependencies defined in Gemfile
end
Jeweler::RubygemsDotOrgTasks.new
Juwelier::RubygemsDotOrgTasks.new

require 'rspec/core'
require 'rspec/core/rake_task'
Expand All @@ -40,7 +44,7 @@ Rake::RDocTask.new do |rdoc|
version = File.exist?('VERSION') ? File.read('VERSION') : ""

rdoc.rdoc_dir = 'rdoc'
rdoc.title = "wistia-api #{version}"
rdoc.title = "ttt #{version}"
rdoc.rdoc_files.include('README*')
rdoc.rdoc_files.include('lib/**/*.rb')
end
20 changes: 12 additions & 8 deletions wistia-api.gemspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# Generated by jeweler
# Generated by juwelier
# DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
# stub: wistia-api 0.2.3 ruby lib

Gem::Specification.new do |s|
s.name = "wistia-api"
s.version = "0.2.3"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.require_paths = ["lib"]
s.authors = ["Jeff Vincent", "Jim Bancroft", "Mark Bates", "Robby Grossman"]
s.date = "2016-09-01"
s.description = "A ruby library for working with Wistia's data API."
Expand Down Expand Up @@ -432,30 +434,32 @@ Gem::Specification.new do |s|
]
s.homepage = "http://github.com/wistia/wistia-api"
s.licenses = ["MIT"]
s.require_paths = ["lib"]
s.rubygems_version = "1.8.23.2"
s.rubygems_version = "2.5.1"
s.summary = "Ruby wrapper for Wistia's API"

if s.respond_to? :specification_version then
s.specification_version = 3
s.specification_version = 4

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<iconv>, [">= 0"])
s.add_development_dependency(%q<bundler>, ["~> 1.2"])
s.add_development_dependency(%q<fakeweb>, ["~> 1.3"])
s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
s.add_development_dependency(%q<juwelier>, [">= 0"])
s.add_development_dependency(%q<simplecov>, [">= 0"])
s.add_development_dependency(%q<rspec>, ["~> 2.12"])
else
s.add_dependency(%q<iconv>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.2"])
s.add_dependency(%q<fakeweb>, ["~> 1.3"])
s.add_dependency(%q<jeweler>, ["~> 1.8"])
s.add_dependency(%q<juwelier>, [">= 0"])
s.add_dependency(%q<simplecov>, [">= 0"])
s.add_dependency(%q<rspec>, ["~> 2.12"])
end
else
s.add_dependency(%q<iconv>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.2"])
s.add_dependency(%q<fakeweb>, ["~> 1.3"])
s.add_dependency(%q<jeweler>, ["~> 1.8"])
s.add_dependency(%q<juwelier>, [">= 0"])
s.add_dependency(%q<simplecov>, [">= 0"])
s.add_dependency(%q<rspec>, ["~> 2.12"])
end
Expand Down

0 comments on commit 5727f65

Please sign in to comment.