Skip to content

Commit

Permalink
Generic update of dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
nerab committed Feb 21, 2014
1 parent 3b92af1 commit 430c5c2
Show file tree
Hide file tree
Showing 21 changed files with 172 additions and 202 deletions.
6 changes: 6 additions & 0 deletions .travis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: ruby
bundler_args: --without development
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
14 changes: 1 addition & 13 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,2 @@
source 'https://rubygems.org'

gem 'ruby-mp3info'
gem 'activesupport', '~> 3.0.10'

group :development do
gem "rake"
gem "bundler", "~> 1.5.1"
gem "jeweler", "~> 1.6.4"
gem 'libxml-ruby', '~> 2.7.0'
gem 'rdoc'
gem 'json'
gem 'pry'
end
gemspec
80 changes: 65 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,54 @@
PATH
remote: .
specs:
dropcaster (0.0.5)
activesupport
ruby-mp3info

GEM
remote: https://rubygems.org/
specs:
activesupport (3.0.20)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
celluloid (0.15.2)
timers (~> 1.1.0)
celluloid-io (0.15.0)
celluloid (>= 0.15.0)
nio4r (>= 0.5.0)
coderay (1.1.0)
git (1.2.6)
jeweler (1.6.4)
debug_inspector (0.0.2)
ffi (1.9.3)
formatador (0.2.4)
guard (2.4.0)
formatador (>= 0.2.4)
listen (~> 2.1)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-bundler (2.0.0)
bundler (~> 1.0)
git (>= 1.2.5)
rake
json (1.8.1)
guard (~> 2.2)
guard-minitest (2.2.0)
guard (~> 2.0)
minitest (>= 3.0)
i18n (0.6.9)
libnotify (0.8.2)
ffi (>= 1.0.11)
libxml-ruby (2.7.0)
libxml-ruby (2.7.0-x86-mingw32)
listen (2.5.0)
celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.4)
method_source (0.8.2)
minitest (5.2.3)
multi_json (1.8.4)
nio4r (1.0.0)
pry (0.9.12.4)
coderay (~> 1.0)
method_source (~> 0.8)
Expand All @@ -21,24 +58,37 @@ GEM
method_source (~> 0.8)
slop (~> 3.4)
win32console (~> 1.3)
pry-nav (0.2.3)
pry (~> 0.9.10)
pry-stack_explorer (0.4.9.1)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
rake (10.1.1)
rdoc (4.1.0)
json (~> 1.4)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
ffi (>= 0.5.0)
rb-readline (0.5.1)
ruby-mp3info (0.8.2)
slop (3.4.7)
thor (0.18.1)
timers (1.1.0)
win32console (1.3.2-x86-mingw32)

PLATFORMS
ruby
x86-mingw32

DEPENDENCIES
activesupport (~> 3.0.10)
bundler (~> 1.5.1)
jeweler (~> 1.6.4)
json
libxml-ruby (~> 2.7.0)
bundler (~> 1.5)
dropcaster!
guard-bundler
guard-minitest
libnotify
libxml-ruby
pry
pry-nav
pry-stack_explorer
rake
rdoc
ruby-mp3info
rb-fsevent
rb-inotify
rb-readline
12 changes: 12 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
guard 'bundler' do
watch('Gemfile')
watch(%r|^.*\.gemspec|)
end

guard 'minitest' do
watch(%r|^test/unit/test_(.*)\.rb|)
watch(%r|^lib/*\.rb|){'test/unit'}
watch(%r|^lib/.*/*\.rb|){'test/unit'}
watch(%r{^lib/.*/([^/]+)\.rb$}){|m| "test/unit/test_#{m[1]}.rb"}
watch(%r|^test/helper\.rb|){'test/unit'}
end
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011 Nicolas E. Rabenau
Copyright (c) 2011-2014 Nicolas E. Rabenau

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
File renamed without changes.
42 changes: 3 additions & 39 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,47 +1,11 @@
# encoding: utf-8

require 'rubygems'
require 'bundler'
begin
Bundler.setup(:default, :development)
rescue Bundler::BundlerError => e
$stderr.puts e.message
$stderr.puts "Run `bundle install` to install missing gems"
exit e.status_code
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
gem.name = "dropcaster"
gem.homepage = "http://nerab.github.com/dropcaster"
gem.license = "MIT"
gem.summary = %Q{Simple Podcast Publishing with Dropbox}
gem.description = %Q{Dropcaster is a podcast feed generator for the command line. It is most simple to use with Dropbox, but works equally well with any other hoster.}
gem.email = "nerab@gmx.at"
gem.authors = ["nerab"]
gem.executables << 'dropcaster'
gem.executables << 'lstags'
# dependencies defined in Gemfile
end
Jeweler::RubygemsDotOrgTasks.new

require 'bundler/gem_tasks'
require 'rake/testtask'

Rake::TestTask.new(:test) do |test|
test.libs << 'lib' << 'test'
test.libs << 'test'
test.pattern = 'test/**/test_*.rb'
test.verbose = true
end

task :default => :test

require 'rdoc/task'
RDoc::Task.new do |rdoc|
version = File.exist?('VERSION') ? File.read('VERSION') : ""

rdoc.rdoc_dir = 'rdoc'
rdoc.title = "dropcaster #{version}"
rdoc.rdoc_files.include('README*')
rdoc.rdoc_files.include('lib/**/*.rb')
end
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

11 changes: 9 additions & 2 deletions bin/dropcaster
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])

require 'rubygems'
require 'yaml'

help = <<HELP
Expand Down Expand Up @@ -39,6 +38,12 @@ opts = OptionParser.new do |opts|
Dropcaster.logger.level = Logger::INFO
end

opts.on("--trace", "Verbose mode - displays additional diagnostic information") do |file|
Dropcaster.logger = Logger.new(STDERR)
Dropcaster.logger.formatter = Dropcaster::LogFormatter.new
Dropcaster.logger.level = Logger::DEBUG
end

opts.on("--channel FILE", "Read the channel definition from FILE instead of channel.yml in the current directory.") do |file|
begin
Dropcaster.logger.info "Reading channel definition from #{file}"
Expand Down Expand Up @@ -116,7 +121,9 @@ begin
puts Dropcaster::Channel.new(sources, options).to_rss
rescue
Dropcaster.logger.error $!.message
Dropcaster.logger.debug $!.backtrace
$!.backtrace.each do |line|
Dropcaster.logger.debug(line)
end
Dropcaster.logger.info usage
exit(1)
end
123 changes: 31 additions & 92 deletions dropcaster.gemspec
Original file line number Diff line number Diff line change
@@ -1,97 +1,36 @@
# Generated by jeweler
# DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
# coding: utf-8
lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'dropcaster/version'

Gem::Specification.new do |s|
s.name = %q{dropcaster}
s.version = "0.0.4"
Gem::Specification.new do |spec|
spec.name = "dropcaster"
spec.version = Dropcaster::VERSION
spec.authors = ["Nicholas E. Rabenau"]
spec.email = ["nerab@gmx.at"]
spec.summary = %q{Simple Podcast Publishing with Dropbox}
spec.description = %q{Dropcaster is a podcast feed generator for the command line. It is most simple to use with Dropbox, but works equally well with any other hoster.}
spec.homepage = "https://github.com/nerab/dropcaster"
spec.license = "MIT"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["nerab"]
s.date = %q{2011-10-24}
s.description = %q{Dropcaster is a podcast feed generator for the command line. It is most simple to use with Dropbox, but works equally well with any other hoster.}
s.email = %q{nerab@gmx.at}
s.executables = ["lstags", "dropcaster", "dropcaster", "lstags"]
s.extra_rdoc_files = [
"LICENSE.txt",
"README.md",
"TODO"
]
s.files = [
".document",
"Gemfile",
"Gemfile.lock",
"LICENSE.txt",
"README.md",
"Rakefile",
"TODO",
"VERSION",
"bin/dropcaster",
"bin/lstags",
"doc/infoPane.png",
"doc/lyricsPane.png",
"doc/sample-channel.yml",
"doc/sample-sidecar.yml",
"doc/videoPane.png",
"dropcaster.gemspec",
"lib/dropcaster.rb",
"lib/dropcaster/channel.rb",
"lib/dropcaster/channel_file_locator.rb",
"lib/dropcaster/errors.rb",
"lib/dropcaster/hashkeys.rb",
"lib/dropcaster/item.rb",
"lib/dropcaster/log_formatter.rb",
"templates/channel.html.erb",
"templates/channel.rss.erb",
"test/extensions/windows.rb",
"test/fixtures/channel.yml",
"test/fixtures/iTunes.mp3",
"test/fixtures/test_template.json.erb",
"test/helper.rb",
"test/unit/test_app.rb",
"test/unit/test_channel.rb",
"test/unit/test_channel_locator.rb",
"test/unit/test_channel_xml.rb",
"test/unit/test_item.rb"
]
s.homepage = %q{http://nerab.github.com/dropcaster}
s.licenses = ["MIT"]
s.require_paths = ["lib"]
s.rubygems_version = %q{1.6.1}
s.summary = %q{Simple Podcast Publishing with Dropbox}
spec.files = `git ls-files -z`.split("\x0")
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

if s.respond_to? :specification_version then
s.specification_version = 3
spec.add_dependency 'ruby-mp3info'
spec.add_dependency 'activesupport'

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<ruby-mp3info>, [">= 0"])
s.add_runtime_dependency(%q<activesupport>, [">= 0"])
s.add_development_dependency(%q<rake>, ["= 0.8.7"])
s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_development_dependency(%q<libxml-ruby>, [">= 0"])
s.add_development_dependency(%q<rdoc>, [">= 0"])
s.add_development_dependency(%q<json>, [">= 0"])
else
s.add_dependency(%q<ruby-mp3info>, [">= 0"])
s.add_dependency(%q<activesupport>, [">= 0"])
s.add_dependency(%q<rake>, ["= 0.8.7"])
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_dependency(%q<libxml-ruby>, [">= 0"])
s.add_dependency(%q<rdoc>, [">= 0"])
s.add_dependency(%q<json>, [">= 0"])
end
else
s.add_dependency(%q<ruby-mp3info>, [">= 0"])
s.add_dependency(%q<activesupport>, [">= 0"])
s.add_dependency(%q<rake>, ["= 0.8.7"])
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_dependency(%q<libxml-ruby>, [">= 0"])
s.add_dependency(%q<rdoc>, [">= 0"])
s.add_dependency(%q<json>, [">= 0"])
end
spec.add_development_dependency 'bundler', "~> 1.5"
spec.add_development_dependency 'rake'
spec.add_development_dependency 'libxml-ruby'
spec.add_development_dependency 'guard-minitest'
spec.add_development_dependency 'guard-bundler'
spec.add_development_dependency 'libnotify'
spec.add_development_dependency 'rb-inotify'
spec.add_development_dependency 'rb-fsevent'
spec.add_development_dependency 'pry'
spec.add_development_dependency 'pry-nav'
spec.add_development_dependency 'pry-stack_explorer'
spec.add_development_dependency 'rb-readline'
end

5 changes: 2 additions & 3 deletions lib/dropcaster.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@
require 'dropcaster/channel_file_locator'

module Dropcaster
VERSION = File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION]))
CHANNEL_YML = 'channel.yml'

mattr_accessor :logger

unless @@logger
@@logger = Logger.new(STDERR)
@@logger.level = Logger::WARN
Expand Down
Loading

0 comments on commit 430c5c2

Please sign in to comment.