pluto 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6abc1a01aefe35e7b10d572f0b30b4fb33bace31
+  data.tar.gz: e48200337087ae33c2184cecad91ef6d5b4bedab
+SHA512:
+  metadata.gz: ff3d03a5848e7e27198d3541ee795a97b6b28947cdb23db36a0f45ebb5f15883f5aae530984bfa45e4c1dac278e58f0fccd7dd1ccce787bb5a5c549aa1c2413d
+  data.tar.gz: 68d0d2f37f6cbd2ed5da1e3f7de53db691e27d57ada9aecf0a44df6258a80ee58786926a46d9a2ab5f54d49d297fb5c6d3835089493c351d542905de6280bfc7

data/HISTORY.md

@@ -1,3 +1,4 @@
-### 0.0.1 / 2012-07-14
 
-* Everything is new. First release
+### 0.0.1 / 2014-12-13
+
+* Everything is new. First release

data/Manifest.txt

@@ -3,31 +3,7 @@ Manifest.txt
 README.md
 Rakefile
 bin/pluto
-config/pluto.index.yml
 lib/pluto.rb
-lib/pluto/activerecord.rb
 lib/pluto/cli/main.rb
 lib/pluto/cli/opts.rb
-lib/pluto/connecter.rb
-lib/pluto/fetcher.rb
-lib/pluto/formatter.rb
-lib/pluto/installer.rb
-lib/pluto/lister.rb
-lib/pluto/manifest_helpers.rb
-lib/pluto/models/activity.rb
-lib/pluto/models/feed.rb
-lib/pluto/models/item.rb
-lib/pluto/models/site.rb
-lib/pluto/models/subscription.rb
-lib/pluto/models/utils.rb
-lib/pluto/refresher.rb
-lib/pluto/schema.rb
-lib/pluto/subscriber.rb
-lib/pluto/tasks/env.rake
-lib/pluto/tasks/setup.rake
-lib/pluto/tasks/stats.rake
-lib/pluto/tasks/update.rake
-lib/pluto/updater.rb
-lib/pluto/version.rb
-test/helper.rb
-test/test_helpers.rb
+lib/pluto/cli/version.rb

data/README.md

@@ -1,39 +1,17 @@
-# pluto
+# pluto gem - command line tool
 
 Another planet generator in ruby - lets you build web pages
 from published web feeds.
 
-* home  :: [github.com/feedreader/pluto](https://github.com/feedreader/pluto)
-* bugs  :: [github.com/feedreader/pluto/issues](https://github.com/feedreader/pluto/issues)
-* gem   :: [rubygems.org/gems/pluto](https://rubygems.org/gems/pluto)
-* rdoc  :: [rubydoc.info/gems/pluto](http://rubydoc.info/gems/pluto)
-* forum :: [groups.google.com/group/feedreader](http://groups.google.com/group/feedreader)
+* home      :: [github.com/feedreader/pluto](https://github.com/feedreader/pluto)
+* bugs      :: [github.com/feedreader/pluto/issues](https://github.com/feedreader/pluto/issues)
+* gem       :: [rubygems.org/gems/pluto](https://rubygems.org/gems/pluto)
+* rdoc      :: [rubydoc.info/gems/pluto](http://rubydoc.info/gems/pluto)
+* templates :: [github.com/planet-templates](https://github.com/planet-templates)
+* forum     :: [groups.google.com/group/feedreader](http://groups.google.com/group/feedreader)
 
-## Usage
-
-Use the `pluto` command line tool and pass in one or more planet configuration files.
-Example:
-
-    pluto build ruby.ini        or
-    pluto b ruby
-
-This will
-
-1) fetch all feeds listed in `ruby.ini` and 
-
-2) store all entries in a local database, that is, `ruby.db` in your working folder and
-
-3) generate a planet web page, that is, `ruby.html` using the [`blank` template pack](https://github.com/feedreader/pluto.blank) in your working folder using all feed entries from the local database.
-
-Open up `ruby.html` to see your planet web page. Voila!
 
-
-Note:  If you pass in no planet configuration files, the `pluto` command line tool will look
-for the default planet configuration files,
-that is, `pluto.ini`, `pluto.yml`, `planet.ini`, `planet.yml`.
-
-
-### Command Line Tool
+## Usage
 
 ~~~~
 NAME
@@ -155,69 +133,6 @@ EXAMPLE
 ~~~
 
 
-
-### Planet Configuration Sample 
-
-`ruby.ini`:
-
-```
-title = Planet Ruby
-
-[rubyflow]
-  title  = Ruby Flow
-  link   = http://rubyflow.com
-  feed   = http://feeds.feedburner.com/Rubyflow?format=xml
-
-[rubyonrails]
-  title = Ruby on Rails Blog
-  link  = http://weblog.rubyonrails.org
-  feed  = http://weblog.rubyonrails.org/feed/atom.xml
-
-[viennarb]
-  title = vienna.rb Blog
-  link  = http://vienna-rb.at
-  feed  = http://vienna-rb.at/atom.xml
-```
-
-or `ruby.yml`:
-
-```
-title: Planet Ruby
-
-
-rubyflow:
-  title: Ruby Flow
-  link:  http://rubyflow.com
-  feed:  http://feeds.feedburner.com/Rubyflow?format=xml
-
-rubyonrails:
-  title: Ruby on Rails Blog
-  link:  http://weblog.rubyonrails.org
-  feed:  http://weblog.rubyonrails.org/feed/atom.xml
-
-viennarb:
-  title: vienna.rb Blog
-  link:  http://vienna-rb.at
-  feed:  http://vienna-rb.at/atom.xml
-```
-
-For more samples, see [`nytimes.ini`](https://github.com/feedreader/pluto.samples/blob/master/nytimes.ini),
-[`js.ini`](https://github.com/feedreader/pluto.samples/blob/master/js.ini),
-[`dart.ini`](https://github.com/feedreader/pluto.samples/blob/master/dart.ini),
-[`haskell.ini`](https://github.com/feedreader/pluto.samples/blob/master/haskell.ini),
-[`viennarb.ini`](https://github.com/feedreader/pluto.samples/blob/master/viennarb.ini),
-[`beer.ini`](https://github.com/feedreader/pluto.samples/blob/master/beer.ini),
-[`football.ini`](https://github.com/feedreader/pluto.samples/blob/master/football.ini).
-
-
-## Template Packs
-
-- Blank - default templates; [more »](https://github.com/feedreader/pluto.blank)
-- News - 'river of news' style templates; [more »](https://github.com/feedreader/pluto.news)
-- Top -  Popurl-style templates; [more »](https://github.com/feedreader/pluto.top)
-- Classic -  Planet Planet-Style templates; [more »](https://github.com/feedreader/pluto.classic)
-
-
 ## Install
 
 Just install the gem:
@@ -225,11 +140,6 @@ Just install the gem:
     $ gem install pluto
 
 
-## Real World Usage
-
-[`pluto.live`](https://github.com/feedreader/pluto.live) - sample planet site; sinatra web app/starter template in ruby using the pluto gem
-
-
 
 ## Alternatives
 

data/Rakefile

@@ -1,9 +1,9 @@
 require 'hoe'
-require './lib/pluto/version.rb'
+require './lib/pluto/cli/version.rb'
 
 Hoe.spec 'pluto' do
 
-  self.version = Pluto::VERSION
+  self.version = PlutoCli::VERSION
 
   self.summary = 'pluto - Another Planet Generator'
   self.description = 'pluto - Another Planet Generator (Lets You Build Web Pages from Published Web Feeds)'
@@ -18,22 +18,18 @@ Hoe.spec 'pluto' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['pakman',    '>= 0.5'], 
-    ['fetcher',   '>= 0.4.3'],    # use min. 0.4.3 - added cache/conditional GET support
-    ['logutils',  '>= 0.6'],
-    ['feedutils', '>= 0.4.0'],    #  use min. 0.4.0 - added rss 2.0 - content:encoded; added fix for rss.item.guid missing; no more auto-summary in atom
-    ['props',     '>= 1.0.3'],    #  use min. 1.0.2 - added ini support
-    ['textutils', '>= 0.7'],      #  use min. 0.7; moved hy/date helpers to gem; future: add some filters (for include/exclude)
-    ['activityutils', '>= 0.1.0' ],
-    ['gli',       '>= 2.5.6']
-    ## ['activerecord', '~> 3.2'],  #  NB:  soft dependency, will include activesupport,etc.
+    ['pluto-models', '>= 1.2.2'], 
+    ['pluto-update', '>= 1.1.0'],
+    ['pluto-merge',  '>= 1.1.0'],
+    ['pluto-tasks',  '>= 1.1.0'],
+    ['gli',          '>= 2.12.2'],
+    ['sqlite3'],
   ]
 
-
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+   required_ruby_version: '>= 1.9.2'
   }
 
 end

data/lib/pluto.rb

@@ -1,155 +1,28 @@
-###
-# NB: for local testing run like:
-#
-# 1.9.x: ruby -Ilib lib/pakman.rb
+# encoding: utf-8
 
-# core and stdlibs
-
-require 'yaml'
-require 'json'
-require 'uri'
-require 'pp'
-require 'optparse'
-require 'fileutils'
-require 'logger'
-require 'date'
-require 'digest/md5'
+require 'pluto/models'
+require 'pluto/update'
+require 'pluto/merge'
+require 'pluto/tasks'
 
 
 # 3rd party ruby gems/libs
 
-require 'active_record'   ## todo: add sqlite3? etc.
-
-require 'logutils'
-require 'props'     # manage settings/env
-require 'fetcher'   # fetch (download) files
-require 'pakman'    # template pack manager
-require 'feedutils'
-require 'textutils'
-
-require 'activityutils'
 
 # our own code
 
-require 'pluto/version'   # let version always get first
-require 'pluto/schema'
-require 'pluto/activerecord'
-
-require 'pluto/models/activity'
-require 'pluto/models/feed'
-require 'pluto/models/item'
-require 'pluto/models/site'
-require 'pluto/models/subscription'
-require 'pluto/models/utils'
-
-require 'pluto/manifest_helpers'
-require 'pluto/connecter'
-
-require 'pluto/installer'
-require 'pluto/fetcher'
-require 'pluto/refresher'
-require 'pluto/subscriber'
-require 'pluto/updater'
-require 'pluto/lister'
-require 'pluto/formatter'
-
+require 'pluto/cli/version'   # note: let version always get first
 require 'pluto/cli/opts'     ## fix: make sure fetcher/updater etc. do not depend on cli/opts
 
 
 module Pluto
 
-  def self.banner
-    ### todo: add RUBY_PATCHLEVEL or RUBY_PATCH_LEVEL  e.g. -p124
-    "pluto/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  end
-
-  def self.generator   # convenience alias for banner (matches HTML generator meta tag)
-    banner
-  end
-
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
-  end
-
-  def self.connect!( config=nil )  # convenience shortcut
-    Connecter.new.connect!( config )
-  end
-
-
-  # todo: add alias update_site( config ) ??
-  def self.update_subscriptions( config )
-    Subscriber.new.update_subscriptions( config )
-  end
-
-  def self.update_feeds
-    Refresher.new.update_feeds
-  end
-
-  def self.update_sites
-    Refresher.new.update_sites
-  end
-
-  def self.load_tasks
-    # load all builtin Rake tasks (from tasks/*rake)
-    load 'pluto/tasks/env.rake'
-    load 'pluto/tasks/setup.rake'
-    load 'pluto/tasks/stats.rake'
-    load 'pluto/tasks/update.rake'
-  end
-
-
   def self.main
     require 'pluto/cli/main'
     ## Runner.new.run(ARGV) - old code
   end
-  
 
 end  # module Pluto
 
 
-
-######
-# todo - move to ext/array.rb or similar
-
-class Array
-
-  ## todo: check if there's already a builtin method for this
-  #
-  #  note:
-  #   in rails ary.in_groups(3)  results in
-  #          top-to-bottom, left-to-right.
-  #  and not left-to-right first and than top-to-bottom.
-  #
-  #  rename to in_groups_vertical(3) ???
-
-  def in_columns( cols )  # alias for convenience for chunks - needed? why? why not?
-    chunks( cols )
-  end
-
-  def chunks( number_of_chunks )
-    ## NB: use chunks - columns might be in use by ActiveRecord! 
-    ###
-    # e.g.
-    #  [1,2,3,4,5,6,7,8,9,10].columns(3)
-    #   becomes:
-    #  [[1,4,7,10],
-    #   [2,5,8],
-    #   [3,6,9]]
-
-    ## check/todo: make a copy of the array first??
-    #  for now reference to original items get added to columns
-    chunks = (1..number_of_chunks).collect { [] }
-    each_with_index do |item,index|
-      chunks[ index % number_of_chunks ] << item
-    end
-    chunks
-  end
-
-end
-
-
-if __FILE__ == $0
-  Pluto.main
-else
-  puts Pluto.banner       # say hello
-end
+Pluto.main   if __FILE__ == $0

data/lib/pluto/cli/main.rb

@@ -42,8 +42,15 @@ Gems versions:
   - fetcher #{Fetcher::VERSION}
   - feedutils #{FeedUtils::VERSION}
   - textutils #{TextUtils::VERSION}
+  - logutils #{LogKernel::VERSION}
   - props #{Props::VERSION}
 
+  - pluto #{PlutoCli::VERSION}
+  - pluto-models #{Pluto::VERSION}
+  - pluto-update #{PlutoUpdate::VERSION}
+  - pluto-merge #{PlutoMerge::VERSION}
+  - pluto-tasks #{PlutoTasks::VERSION}
+
     Env home: #{Env.home}
 Pluto config: #{opts.config_path}
   Pluto root: #{Pluto.root}
@@ -193,10 +200,10 @@ command [:fetch, :f] do |c|
       database: "#{opts.db_path}/#{opts.db_name}"
     }
 
-    Pluto::Connecter.new.connect!( db_config )
+    Pluto.connect( db_config )
 
     args.each do |arg|
-      feed_rec = Pluto::Models::Feed.find_by_key!( arg )
+      feed_rec = Pluto::Model::Feed.find_by_key!( arg )
 
       puts "feed_rec:"
       pp feed_rec
@@ -258,7 +265,7 @@ command [:merge, :m] do |c|
         database: "#{opts.db_path}/#{db_name}"
       }
 
-      Pluto::Connecter.new.connect!( db_config )
+      Pluto.connect( db_config )
 
       config = load_config( arg )
     
@@ -304,7 +311,9 @@ command [:update, :up, :u] do |c|
         database: "#{opts.db_path}/#{db_name}"
       }
 
-      Pluto::Connecter.new.connect!( db_config )
+      # Note: use ! version w/ auto-migrate!  - why? why not??
+      ## just use regular connect??
+      Pluto.connect!( db_config )
 
       config = load_config( arg )
 
@@ -356,7 +365,8 @@ command [:build, :b] do |c|
         database: "#{opts.db_path}/#{db_name}"
       }
 
-      Pluto::Connecter.new.connect!( db_config )
+      # Note: use ! version w/ auto-migrate!
+      Pluto.connect!( db_config )
 
       config = load_config( arg )
 
@@ -452,4 +462,4 @@ on_error do |e|
 end
 
 
-exit run(ARGV)
+exit run(ARGV)