pluto 0.8.7 → 0.8.8

data/README.md

@@ -72,10 +72,14 @@ SYNOPSIS
 COMMAND OPTIONS
     -o, --output=PATH       - Output Path (default: .)
     -t, --template=MANIFEST - Template Manifest (default: blank)
-    
+    -d, --dbpath=PATH       - Database path (default: .)
+    -n, --dbname=NAME       - Database name (default: <PLANET>.db e.g. ruby.db)
+
 EXAMPLE
     pluto build ruby.yml
+    pluto build ruby.yml --template news
     pluto b ruby
+    pluto b ruby -t news
     pluto b            # will use pluto.ini|pluto.yml|planet.ini|planet.yml if present
 ~~~
 
@@ -115,6 +119,10 @@ EXAMPLE
 NAME
     update - Update planet feeds
 
+COMMAND OPTIONS
+    -d, --dbpath=PATH       - Database path (default: .)
+    -n, --dbname=NAME       - Database name (default: <PLANET>.db e.g. ruby.db)
+
 SYNOPSIS
     pluto [global options] update FILE
 
@@ -136,10 +144,14 @@ SYNOPSIS
 COMMAND OPTIONS
     -o, --output=PATH       - Output Path (default: .)
     -t, --template=MANIFEST - Template Manifest (default: blank)
+    -d, --dbpath=PATH       - Database path (default: .)
+    -n, --dbname=NAME       - Database name (default: <PLANET>.db e.g. ruby.db)
 
 EXAMPLE
     pluto merge ruby.yml
+    pluto merge ruby.yml --template news
     pluto m ruby
+    pluto m ruby -t news
 ~~~
 
 
@@ -231,7 +243,7 @@ Planet Mars by Sam Ruby [(Site)](https://github.com/rubys/mars) -  first draft o
 
 ### Python
 
-Planet Planet by Scott James Remnant ann 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 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
 

data/lib/pluto/cli/main.rb

@@ -187,7 +187,7 @@ command [:fetch, :f] do |c|
     #####
     # todo: add into method for reuse for build/merge/fetch
     #   all use the same code
- 
+
     db_config = {
       adapter:  'sqlite3',
       database: "#{opts.db_path}/#{opts.db_name}"
@@ -229,6 +229,16 @@ command [:merge, :m] do |c|
   c.default_value opts.manifest
   c.flag [:t, :template]
 
+  c.desc 'Database path'
+  c.arg_name 'PATH'
+  c.default_value opts.db_path
+  c.flag [:d, :dbpath]
+
+  c.desc 'Database name'
+  c.arg_name 'NAME'
+  c.default_value '<PLANET>.db e.g. ruby.db'
+  c.flag [:n, :dbname]
+
 
   c.action do |g,o,args|
     logger.debug 'hello from merge command'
@@ -241,10 +251,12 @@ command [:merge, :m] do |c|
       #####
       # todo: add into method for reuse for build/merge/fetch
       #   all use the same code
+
+      db_name = opts.db_name? ? opts.db_name : "#{name}.db"
  
       db_config = {
         adapter:  'sqlite3',
-        database: "#{opts.output_path}/#{name}.db"
+        database: "#{opts.db_path}/#{db_name}"
       }
 
       Pluto::Connecter.new.connect!( db_config )
@@ -264,6 +276,17 @@ desc 'Update planet feeds'
 arg_name 'FILE', multiple: true   ## todo/fix: check multiple will not print typeo???
 command [:update, :up, :u] do |c|
 
+  c.desc 'Database path'
+  c.arg_name 'PATH'
+  c.default_value opts.db_path
+  c.flag [:d, :dbpath]
+
+  c.desc 'Database name'
+  c.arg_name 'NAME'
+  c.default_value '<PLANET>.db e.g. ruby.db'
+  c.flag [:n, :dbname]
+
+
   c.action do |g,o,args|
     logger.debug 'hello from update command'
 
@@ -275,10 +298,12 @@ command [:update, :up, :u] do |c|
       #####
       # todo: add into method for reuse for build/merge/fetch
       #   all use the same code
+
+      db_name = opts.db_name? ? opts.db_name : "#{name}.db"
  
       db_config = {
         adapter:  'sqlite3',
-        database: "#{opts.output_path}/#{name}.db"
+        database: "#{opts.db_path}/#{db_name}"
       }
 
       Pluto::Connecter.new.connect!( db_config )
@@ -308,6 +333,16 @@ command [:build, :b] do |c|
   c.default_value opts.manifest
   c.flag [:t, :template]
 
+  c.desc 'Database path'
+  c.arg_name 'PATH'
+  c.default_value opts.db_path
+  c.flag [:d, :dbpath]
+
+  c.desc 'Database name'
+  c.arg_name 'NAME'
+  c.default_value '<PLANET>.db e.g. ruby.db'
+  c.flag [:n, :dbname]
+
 
   c.action do |g,o,args|
     logger.debug 'hello from build command'
@@ -317,9 +352,11 @@ command [:build, :b] do |c|
     args.each do |arg|
       name    = File.basename( arg, '.*' )
 
+      db_name = opts.db_name? ? opts.db_name : "#{name}.db"
+
       db_config = {
         adapter:  'sqlite3',
-        database: "#{opts.output_path}/#{name}.db"
+        database: "#{opts.db_path}/#{db_name}"
       }
 
       Pluto::Connecter.new.connect!( db_config )

data/lib/pluto/cli/opts.rb

@@ -19,22 +19,16 @@ class Opts
     @manifest       =   options[:template]  if options[:template].present?
   end
 
-  def db_path
-    @db_path || '.'
-  end
 
-  def db_name
-    @db_name || 'pluto.db'
-  end
+  # lets us check if user passed in db settings
+  def db_name?()   @db_name.present? ;  end
 
+  def db_path()    @db_path || '.' ;         end
+  def db_name()    @db_name || 'pluto.db' ;  end
 
-  def manifest=(value)
-    @manifest = value
-  end
-  
-  def manifest
-    @manifest || 'blank'
-  end
+
+  def manifest=(value)   @manifest = value;  end
+  def manifest()         @manifest || 'blank' ;  end
 
   def verbose=(value)
     @verbose = true  # note: always assumes true for now; default is false

data/lib/pluto/version.rb

@@ -1,4 +1,4 @@
 
 module Pluto
-  VERSION = '0.8.7'
+  VERSION = '0.8.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &79324440 !ruby/object:Gem::Requirement
+  requirement: &82398980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *79324440
+  version_requirements: *82398980
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &79324160 !ruby/object:Gem::Requirement
+  requirement: &82398670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *79324160
+  version_requirements: *82398670
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &79323870 !ruby/object:Gem::Requirement
+  requirement: &82398350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *79323870
+  version_requirements: *82398350
 - !ruby/object:Gem::Dependency
   name: feedutils
-  requirement: &79323600 !ruby/object:Gem::Requirement
+  requirement: &82398090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *79323600
+  version_requirements: *82398090
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &79323280 !ruby/object:Gem::Requirement
+  requirement: &82397860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *79323280
+  version_requirements: *82397860
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &79323050 !ruby/object:Gem::Requirement
+  requirement: &82397520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *79323050
+  version_requirements: *82397520
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &79322720 !ruby/object:Gem::Requirement
+  requirement: &82397240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *79322720
+  version_requirements: *82397240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &79322460 !ruby/object:Gem::Requirement
+  requirement: &82396970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *79322460
+  version_requirements: *82396970
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &79322170 !ruby/object:Gem::Requirement
+  requirement: &82396660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *79322170
+  version_requirements: *82396660
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: feedreader@googlegroups.com