serienrenamer 0.0.6 → 0.0.7

data/Manifest.txt

@@ -17,7 +17,6 @@ script/generate
 serienrenamer.gemspec
 test/serienjunkies_feed_sample.xml
 test/test_episode.rb
-test/test_hash.rb
 test/test_helper.rb
 test/test_information_store.rb
 test/test_plugin_serienjunkies_de.rb

data/Rakefile

@@ -12,11 +12,12 @@ Hoe.plugin :newgem
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'serienrenamer' do
   self.developer 'Philipp Boehm', 'philipp@i77i.de'
-  self.rubyforge_name       = self.name
+  self.rubyforge_name = self.name
   self.dependency('wlapi', '>= 0.8.4')
   self.dependency('mediawiki-gateway', '>= 0.4.4')
   self.dependency('mechanize', '>= 2.3')
   self.dependency('highline', '>= 1.6.11')
+  self.dependency('hashconfig', '>= 0.0.1')
 end
 
 require 'newgem/tasks'

data/bin/serienrenamer

@@ -8,6 +8,8 @@ require 'serienrenamer'
 require 'plugin'
 require 'optparse'
 require 'fileutils'
+require 'hashconfig'
+require 'yaml'
 require "highline/system_extensions"
 include HighLine::SystemExtensions
 
@@ -63,6 +65,12 @@ opts.on( "-a", "--[no-]all",
     options[:process_all_files] = opt
 end
 
+opts.on( "--showconfig", "Prints the current configuration.") do |opt|
+    puts "loaded configuration options:"
+    puts config.to_yaml
+    exit(0)
+end
+
 opts.on( "-v", "--version",
          "Prints the version number.") do |opt|
     puts Serienrenamer::VERSION

data/lib/serienrenamer.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 
 module Serienrenamer
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
 
     require 'serienrenamer/episode.rb'
     require 'serienrenamer/information_store.rb'
@@ -25,33 +25,4 @@ module Serienrenamer
             self.plugin_name
         end
     end
-
-    # reopening Hash class and added a persistence method
-    require 'yaml'
-
-    class ::Hash
-
-        # this method merges a YAML-serialized hash-instance
-        # with self. if the given File is not exisiting this will write
-        # a serialized version of self to this file.
-        #
-        # if the given yaml file does not contain a serialized hash than it
-        # merges with an empty hash that returns self unchanged.
-        #
-        # returns a new Hash merged with deserialized version from the file
-        def merge_with_serialized(yaml_file)
-
-            unless File.file? yaml_file
-                File.open(yaml_file, 'w') {|f| f.write(self.to_yaml) }
-            end
-
-            persistent_config = YAML.load(File.new(yaml_file, "rb").read)
-            persistent_config = Hash.new unless persistent_config.is_a? Hash
-
-            config = self.merge(persistent_config)
-            File.open(yaml_file, 'w') {|f| f.write(config.to_yaml) }
-
-            return config
-        end
-    end
 end

data/serienrenamer.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "serienrenamer"
-  s.version = "0.0.2"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philipp Boehm"]
-  s.date = "2012-03-04"
+  s.date = "2012-03-23"
   s.description = "Ruby Script that brings your series into an appropriate format\nlike \"S01E01 - Episodename.avi\""
   s.email = ["philipp@i77i.de"]
   s.executables = ["serienrenamer"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "bin/serienrenamer", "lib/plugin.rb", "lib/plugin/serienjunkies_de.rb", "lib/plugin/serienjunkies_feed.rb", "lib/plugin/textfile.rb", "lib/plugin/wikipedia.rb", "lib/serienrenamer.rb", "lib/serienrenamer/episode.rb", "script/console", "script/destroy", "script/generate", "serienrenamer.gemspec", "test/serienjunkies_feed_sample.xml", "test/test_episode.rb", "test/test_helper.rb", "test/test_plugin_serienjunkies_de.rb", "test/test_plugin_serienjunkies_feed.rb", "test/test_plugin_textfile.rb", "test/test_plugin_wikipedia.rb", ".gemtest"]
+  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "bin/serienrenamer", "lib/plugin.rb", "lib/plugin/serienjunkies_de.rb", "lib/plugin/serienjunkies_feed.rb", "lib/plugin/textfile.rb", "lib/plugin/wikipedia.rb", "lib/serienrenamer.rb", "lib/serienrenamer/episode.rb", "lib/serienrenamer/information_store.rb", "script/console", "script/destroy", "script/generate", "serienrenamer.gemspec", "test/serienjunkies_feed_sample.xml", "test/test_episode.rb", "test/test_helper.rb", "test/test_information_store.rb", "test/test_plugin_serienjunkies_de.rb", "test/test_plugin_serienjunkies_feed.rb", "test/test_plugin_textfile.rb", "test/test_plugin_wikipedia.rb"]
   s.homepage = "http://github.com/pboehm/serienrenamer"
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "serienrenamer"
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.19"
   s.summary = "Ruby Script that brings your series into an appropriate format like \"S01E01 - Episodename.avi\""
-  s.test_files = ["test/test_plugin_serienjunkies_de.rb", "test/test_plugin_wikipedia.rb", "test/test_plugin_serienjunkies_feed.rb", "test/test_plugin_textfile.rb", "test/test_helper.rb", "test/test_episode.rb"]
+  s.test_files = ["test/test_plugin_serienjunkies_de.rb", "test/test_information_store.rb", "test/test_plugin_wikipedia.rb", "test/test_plugin_serienjunkies_feed.rb", "test/test_plugin_textfile.rb", "test/test_helper.rb", "test/test_episode.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -28,25 +28,28 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mediawiki-gateway>, [">= 0.4.4"])
       s.add_runtime_dependency(%q<mechanize>, [">= 2.3"])
       s.add_runtime_dependency(%q<highline>, [">= 1.6.11"])
+      s.add_runtime_dependency(%q<hashconfig>, [">= 0.0.1"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_development_dependency(%q<newgem>, [">= 1.5.3"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.15"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.0"])
     else
       s.add_dependency(%q<wlapi>, [">= 0.8.4"])
       s.add_dependency(%q<mediawiki-gateway>, [">= 0.4.4"])
       s.add_dependency(%q<mechanize>, [">= 2.3"])
       s.add_dependency(%q<highline>, [">= 1.6.11"])
+      s.add_dependency(%q<hashconfig>, [">= 0.0.1"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_dependency(%q<newgem>, [">= 1.5.3"])
-      s.add_dependency(%q<hoe>, ["~> 2.15"])
+      s.add_dependency(%q<hoe>, ["~> 3.0"])
     end
   else
     s.add_dependency(%q<wlapi>, [">= 0.8.4"])
     s.add_dependency(%q<mediawiki-gateway>, [">= 0.4.4"])
     s.add_dependency(%q<mechanize>, [">= 2.3"])
     s.add_dependency(%q<highline>, [">= 1.6.11"])
+    s.add_dependency(%q<hashconfig>, [">= 0.0.1"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
     s.add_dependency(%q<newgem>, [">= 1.5.3"])
-    s.add_dependency(%q<hoe>, ["~> 2.15"])
+    s.add_dependency(%q<hoe>, ["~> 3.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serienrenamer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wlapi
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.11
+- !ruby/object:Gem::Dependency
+  name: hashconfig
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '3.0'
 description: ! 'Ruby Script that brings your series into an appropriate format
 
   like "S01E01 - Episodename.avi"'
@@ -155,14 +171,12 @@ files:
 - serienrenamer.gemspec
 - test/serienjunkies_feed_sample.xml
 - test/test_episode.rb
-- test/test_hash.rb
 - test/test_helper.rb
 - test/test_information_store.rb
 - test/test_plugin_serienjunkies_de.rb
 - test/test_plugin_serienjunkies_feed.rb
 - test/test_plugin_textfile.rb
 - test/test_plugin_wikipedia.rb
-- .gemtest
 homepage: http://github.com/pboehm/serienrenamer
 licenses: []
 post_install_message: 
@@ -185,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: serienrenamer
-rubygems_version: 1.8.19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Ruby Script that brings your series into an appropriate format like "S01E01
@@ -198,4 +212,3 @@ test_files:
 - test/test_plugin_textfile.rb
 - test/test_helper.rb
 - test/test_episode.rb
-- test/test_hash.rb

data/test/test_hash.rb

@@ -1,54 +0,0 @@
-# encoding: UTF-8
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'yaml'
-
-# test class for the merge_with_serialized option of the Hash class
-# which is added to the class of the standard library
-class TestHash < Test::Unit::TestCase
-
-    @@TEST_DATA = {
-        :first  => "first parameter",
-        :second => "second parameter",
-        :third  => "third parameter"
-    }
-
-    @@TEST_CONFIG_FILE =
-        File.join(TestHelper::TESTFILE_DIRECTORY, "config.yml")
-    @@TEST_EMPTY_CONFIG_FILE =
-        File.join(TestHelper::TESTFILE_DIRECTORY, "empty.yml")
-    @@TEST_INVALID_CONFIG_FILE =
-        File.join(TestHelper::TESTFILE_DIRECTORY, "invalid.yml")
-    @@TEST_NOT_EXISTING =
-        File.join(TestHelper::TESTFILE_DIRECTORY, "not_exisiting.yml")
-
-    def setup
-        TestHelper.create_test_files([])
-        @modified = @@TEST_DATA.merge({:third => "modified third parameter"})
-
-        File.open(@@TEST_CONFIG_FILE, 'w') {|f| f.write(@modified.to_yaml) }
-        File.open(@@TEST_EMPTY_CONFIG_FILE, 'w') {|f| f.write(Hash.new.to_yaml) }
-        File.open(@@TEST_EMPTY_CONFIG_FILE, 'w') {|f| f.write("invalid") }
-
-    end
-
-    def teardown
-        TestHelper.clean
-    end
-
-    def test_merge_valid_yaml_file
-        merged = @@TEST_DATA.merge_with_serialized(@@TEST_CONFIG_FILE)
-        assert_equal("modified third parameter", merged[:third])
-    end
-
-    def test_merge_invalid_empty_and_not_exisiting_yaml_file
-        merged = @@TEST_DATA.merge_with_serialized(@@TEST_EMPTY_CONFIG_FILE)
-        assert_equal("third parameter", merged[:third])
-
-        merged = @@TEST_DATA.merge_with_serialized(@@TEST_INVALID_CONFIG_FILE)
-        assert_equal("third parameter", merged[:third])
-
-        merged = @@TEST_DATA.merge_with_serialized(@@TEST_NOT_EXISTING)
-        assert_equal("third parameter", merged[:third])
-    end
-
-end