tweetwine 0.4.4 → 0.4.5

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 0.4.5 released 2012-04-26
+
+* Fix empty config file handling on Ruby 1.9.3-p194
+* Upgrade gem dependencies for tests
+
 === 0.4.4 released 2012-01-06
 
 * Simplify source file autoloading, relying on `lib` beign in $LOAD_PATH

data/Rakefile

@@ -11,11 +11,11 @@ task :bm do
 end
 
 namespace :gem do
-  CLOBBER.include "#{Project.spec[:name]}-*.gem"
+  CLOBBER.include "#{Project[:spec][:name]}-*.gem"
 
   desc "Package the software as a gem"
   task :build => [:"man:build", :"test:all"] do
-    sh %{gem build #{Project.spec[:name]}.gemspec}
+    sh %{gem build #{Project[:spec][:name]}.gemspec}
   end
 
   desc "Install the software as a gem"
@@ -25,29 +25,29 @@ namespace :gem do
 
   desc "Uninstall the gem"
   task :uninstall => :clean do
-    sh %{gem uninstall #{Project.spec[:name]}}
+    sh %{gem uninstall #{Project[:spec][:name]}}
   end
 end
 
 namespace :man do
-  CLOBBER.include "#{Project.dirs[:man]}/#{Project.spec[:name]}.?", "#{Project.dirs[:man]}/#{Project.spec[:name]}.?.html"
+  CLOBBER.include "#{Project[:dir][:man]}/#{Project[:spec][:name]}.?", "#{Project[:dir][:man]}/#{Project[:spec][:name]}.?.html"
 
   desc "Build the manual"
   task :build do
-    sh %{ronn --html --roff --manual='#{Project.spec[:name].capitalize} Manual' --organization='#{Project.spec[:authors].first}' #{Project.dirs[:man]}/*.ronn}
+    sh %{ronn --html --roff --manual='#{Project[:spec][:name].capitalize} Manual' --organization='#{Project[:spec][:authors].first}' #{Project[:dir][:man]}/*.ronn}
   end
 
   desc "Show the manual section 7"
   task :show => :build do
-    sh %{man #{Project.dirs[:man]}/#{Project.spec[:name]}.7}
+    sh %{man #{Project[:dir][:man]}/#{Project[:spec][:name]}.7}
   end
 end
 
-CLOBBER.include Project.dirs[:rdoc]
+CLOBBER.include Project[:dir][:rdoc]
 
 desc "Generate RDoc"
 task :rdoc do
-  sh %{rdoc --encoding=UTF-8 --line-numbers --title='#{Project.extra[:title]}' --output=#{Project.dirs[:rdoc]} *.rdoc LICENSE.txt lib}
+  sh %{rdoc --encoding=UTF-8 --line-numbers --title='#{Project[:extra][:title]}' --output=#{Project[:dir][:rdoc]} *.rdoc LICENSE.txt lib}
 end
 
 namespace :test do
@@ -55,12 +55,12 @@ namespace :test do
     base_dir  = options[:base_dir]
     file_glob = options[:file_glob] || '**/*_test.rb'
     test_desc = options[:desc] || "Run #{type} tests"
-    includes  = ['lib', Project.dirs[:test]].map { |dir| "-I #{dir}" }.join(' ')
+    includes  = ['lib', Project[:dir][:test]].map { |dir| "-I #{dir}" }.join(' ')
     warn_opt  = options[:warn] ? '-w' : ''
 
     desc test_desc
     task type do
-      file_name_offset = Project.dirs[:test].size + 1
+      file_name_offset = Project[:dir][:test].size + 1
       neg_dotrb_suffix = -'.rb'.size - 1
       tests = Dir["#{base_dir}/#{file_glob}"].
           map { |file| file[file_name_offset..neg_dotrb_suffix] }.
@@ -70,11 +70,11 @@ namespace :test do
   end
 
   create_test_task :unit,
-      :base_dir   => "#{Project.dirs[:test]}/unit",
+      :base_dir   => "#{Project[:dir][:test]}/unit",
       :warn       => true
 
   create_test_task :integration,
-      :base_dir   => "#{Project.dirs[:test]}/integration",
+      :base_dir   => "#{Project[:dir][:test]}/integration",
       :warn       => false
 
   desc "Run all tests"

data/lib/tweetwine/config.rb

@@ -58,7 +58,7 @@ module Tweetwine
     end
 
     def self.parse_config_file(config_file)
-      config = YAML.load_file config_file
+      config = YAML.load File.read(config_file)
       raise ConfigError, "invalid config file; it must be a mapping style YAML document: #{config_file}" unless config.is_a? Hash
       Support.symbolize_hash_keys(config)
     end

data/lib/tweetwine/version.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 module Tweetwine
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.4.5'.freeze
 
   class << self
     def version

data/project.rb

@@ -6,27 +6,25 @@ lib_dir = File.expand_path('lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include? lib_dir
 require 'tweetwine/version'
 
-Project = Struct.new('Project', :spec, :dirs, :extra).new(
-  {
-    :name         => 'tweetwine',
-    :version      => Tweetwine.version.dup,
+name = 'tweetwine'
+version = Tweetwine.version.dup
+
+Project = {
+  :spec => {
+    :name         => name,
+    :version      => version,
     :summary      => Tweetwine.summary,
-    :description  => '',
+    :description  => 'A simple but tasty Twitter agent for command line use, designed for quickly\nshowing the latest tweets.',
     :email        => 'tkareine@gmail.com',
     :homepage     => 'https://github.com/tkareine/tweetwine',
     :authors      => ['Tuomas Kareinen']
   },
-  {
+  :extra => {
+    :title => "#{name} #{version}"
+  },
+  :dir => {
     :man  => 'man',
     :rdoc => 'rdoc',
     :test => 'test'
-  },
-  {}
-)
-
-Project.spec[:description] = <<-END
-A simple but tasty Twitter agent for command line use, designed for quickly
-showing the latest tweets.
-  END
-
-Project.extra[:title] = "#{Project.spec[:name]} #{Project.spec[:version]}"
+  }
+}

data/tweetwine.gemspec

@@ -3,21 +3,21 @@
 require File.expand_path('project', File.dirname(__FILE__))
 
 Gem::Specification.new do |s|
-  Project.spec.each { |(key, value)| s.send "#{key}=", value }
+  Project[:spec].each { |(key, value)| s.send "#{key}=", value }
 
-  s.files = `git ls-files`.split("\n") + Dir["#{Project.dirs[:man]}/**/*.[1-9]"]
-  s.test_files = `git ls-files -- #{Project.dirs[:test]}/*`.split("\n")
+  s.files = `git ls-files`.split("\n") + Dir["#{Project[:dir][:man]}/**/*.[1-9]"]
+  s.test_files = `git ls-files -- #{Project[:dir][:test]}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
   s.add_dependency 'oauth', '~> 0.4.4'
   s.add_development_dependency 'gem-man',       '~> 0.3.0'
-  s.add_development_dependency 'minitest',      '~> 2.10.0'
-  s.add_development_dependency 'mocha',         '~> 0.10.0'
+  s.add_development_dependency 'minitest',      '~> 2.12.1'
+  s.add_development_dependency 'mocha',         '~> 0.11.3'
   s.add_development_dependency 'open4',         '~> 1.3.0'
   s.add_development_dependency 'rake',          '>= 0.8.7'
   s.add_development_dependency 'ronn',          '~> 0.7.3'
   s.add_development_dependency 'timecop',       '~> 0.3.5'
-  s.add_development_dependency 'webmock',       '~> 1.7.7'
+  s.add_development_dependency 'webmock',       '~> 1.8.6'
 
   s.post_install_message = <<-END
 
@@ -27,5 +27,5 @@ default. For Ruby 1.8, you can install 'json' gem, for example.
   END
 
   s.extra_rdoc_files = Dir['*.rdoc', 'LICENSE.txt']
-  s.rdoc_options << '--title' << Project.extra[:title] << '--exclude' << Project.dirs[:test]
+  s.rdoc_options << '--title' << Project[:extra][:title] << '--exclude' << Project[:dir][:test]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetwine
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &2152440040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152440040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: gem-man
-  requirement: &2152438940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,32 +37,47 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152438940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152438140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.12.1
   type: :development
   prerelease: false
-  version_requirements: *2152438140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152437460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.3
   type: :development
   prerelease: false
-  version_requirements: *2152437460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &2152436640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152436640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152435700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2152435700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: ronn
-  requirement: &2152435000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2152435000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2152434160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,24 +133,30 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2152434160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2152433300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.8.6
   type: :development
   prerelease: false
-  version_requirements: *2152433300
-description: ! 'A simple but tasty Twitter agent for command line use, designed for
-  quickly
-
-  showing the latest tweets.
-
-'
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.6
+description: A simple but tasty Twitter agent for command line use, designed for quickly\nshowing
+  the latest tweets.
 email: tkareine@gmail.com
 executables:
 - tweetwine
@@ -217,7 +258,7 @@ post_install_message: ! '
 '
 rdoc_options:
 - --title
-- tweetwine 0.4.4
+- tweetwine 0.4.5
 - --exclude
 - test
 require_paths:
@@ -230,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1641639736331588136
+      hash: 28626873183406081
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,10 +280,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1641639736331588136
+      hash: 28626873183406081
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Tweetwine shows the latest tweets from the command line quickly.