pluto 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fce72294cc01ee6e152e6df0fccbcd9c69df4d0
-  data.tar.gz: caa99dc25febfecc78513cebf21f119f5326b17d
+  metadata.gz: 2a1333bbf4d46791b54f5b77b96d86dbaffcf3a4
+  data.tar.gz: 09d431c970583c027818e707f0f9a24791276fc5
 SHA512:
-  metadata.gz: fbf4788bcae1cabc939a2f7cc346af61523887119f255b0a158d0ba2faa38f0d1be6ea86cfe4cca7a925cc905747f41bd2381f08384a96f374c9b89ca0346ae2
-  data.tar.gz: cb69dcd3545bed22ba3dd00c218cea4195504aa3b12f095b4e26565ee3fbd8093e7b6a5c012c0a3a87db0c07d500bde0c57c7d4a2f6ecea1a53404447cf69fa6
+  metadata.gz: c08d13ddf9fe2255d639353319687e3d8cc50df12b8d74dee0a162811775acc744929025bbb861f3606234c532e08baa333650cbd2ffd681a429bc3ae73420b9
+  data.tar.gz: 4ea0263e98596344b7a66d5c7c9d47e659f79b656c4a474d021c0af826ef8360239a4c56091f67c9c09a487ca1e559ade1115ecb9534d630f34fdf9f8d53701f

data/README.md

@@ -140,24 +140,6 @@ Just install the gem:
     $ gem install pluto
 
 
-
-## Alternatives
-
-### Ruby
-
-`planet.rb` by Akira Yamada [(Site)](http://planet.rubyforge.org)
-
-`planet.rb` by Pablo Astigarraga [(Site)](https://github.com/pote/planet.rb)  - used with jekyll/octopress site generator
-
-Planet Mars by Sam Ruby [(Site)](https://github.com/rubys/mars) -  first draft of cleaned up Planet Planet code; last change in 2008
-
-### Python
-
-Planet Planet by Scott James Remnant and Jeff Waugh [(Site)](http://www.planetplanet.org)  - uses Mark Pilgrim's universal feed parser (RDF, RSS and Atom) and Tomas Styblo's templating engine; last release version 2.0 in 2006
-
-Planet Venus by Sam Ruby [(Site)](https://github.com/rubys/venus) - cleaned up Planet Planet code; last change in 2010
-
-
 ## License
 
 The `pluto` scripts are dedicated to the public domain.

data/Rakefile

@@ -18,10 +18,10 @@ Hoe.spec 'pluto' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['pluto-models', '>= 1.3.2'],
-    ['pluto-update', '>= 1.5.0'],
+    ['pluto-models', '>= 1.4.0'],
+    ['pluto-update', '>= 1.6.0'],
     ['pluto-merge',  '>= 1.1.0'],
-    ['pluto-tasks',  '>= 1.5.0'],
+    ['pluto-tasks',  '>= 1.5.2'],
     ['gli',          '>= 2.12.2'],
     ['sqlite3'],
   ]

data/lib/pluto/cli/main.rb

@@ -6,7 +6,7 @@ require 'gli'
 include GLI::App
 
 program_desc 'another planet generator (lets you build web pages from published web feeds)'
-version Pluto::VERSION
+version PlutoCli::VERSION
 
 
 ## some setup code 
@@ -380,8 +380,8 @@ pre do |g,c,o,args|
   opts.merge_gli_options!( g )
   opts.merge_gli_options!( o )
 
-  puts Pluto.banner
-  
+  puts PlutoCli.banner
+
   LogUtils::Logger.root.level = :debug    if opts.verbose?
 
   logger.debug "   executing command #{c.name}"

data/lib/pluto/cli/sysinfo.rb

@@ -17,12 +17,13 @@ class SysInfo
   def dump
   puts <<EOS
 
-#{Pluto.banner}
+#{PlutoCli.banner}
 
 Gems versions:
   - pakman #{Pakman::VERSION}
   - fetcher #{Fetcher::VERSION}
-  - feedutils #{FeedUtils::VERSION}
+  - feedparser #{FeedParser::VERSION}
+  - feedfilter #{FeedFilter::VERSION}
   - textutils #{TextUtils::VERSION}
   - logutils #{LogKernel::VERSION}
   - props #{Props::VERSION}

data/lib/pluto/cli/updater.rb

@@ -1,13 +1,6 @@
 # encoding: utf-8
 
 
-####
-##
-## todo:
-##   check if Updater used by pluto-tasks???
-###   if NOT - move to pluto ( use commands/updater or something)
-##
-
 
 module Pluto
 
@@ -50,11 +43,10 @@ class Updater
 
     ###################
     # step 1) update site subscriptions
-    site_updater = SiteUpdater.new
 
     # pass along debug/verbose setting/switch
-    site_updater.debug = true    if opts.verbose?
-    site_updater.update_subscriptions_for( site_key, config )
+    ## site_updater.debug = true    if opts.verbose?
+    Model::Site.deep_create_or_update_from_hash!( site_key, config )
 
     ##############################
     # step 2) update feeds

data/lib/pluto/cli/version.rb

@@ -4,7 +4,7 @@ module PlutoCli
 
   MAJOR = 1
   MINOR = 2
-  PATCH = 2
+  PATCH = 3
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pluto-update
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: pluto-merge
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement