pluto 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6abc1a01aefe35e7b10d572f0b30b4fb33bace31
-  data.tar.gz: e48200337087ae33c2184cecad91ef6d5b4bedab
+  metadata.gz: 501f33f77b501c98c479fac286684ee16b6fdd86
+  data.tar.gz: ac3938a62330dc883d1c0b81db1716da0e45560e
 SHA512:
-  metadata.gz: ff3d03a5848e7e27198d3541ee795a97b6b28947cdb23db36a0f45ebb5f15883f5aae530984bfa45e4c1dac278e58f0fccd7dd1ccce787bb5a5c549aa1c2413d
-  data.tar.gz: 68d0d2f37f6cbd2ed5da1e3f7de53db691e27d57ada9aecf0a44df6258a80ee58786926a46d9a2ab5f54d49d297fb5c6d3835089493c351d542905de6280bfc7
+  metadata.gz: 7a658b5ade5742afd867c5391a99508fc189df89203b564b03d0b24468d40a5f477ea4552cd6f9d42ca1b815227e09344e6c25a1861bb354a34df34dd3e76fb0
+  data.tar.gz: e4fb0cee5ec56bcbc59986cb4935e39549db64e76f4187c967aa9217d0787327e17d8e979e50ab7b8a6bae63e6408f6aab13bab7b62e12a0c7cbb844f4f1170a

data/Rakefile

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

data/lib/pluto.rb

@@ -13,6 +13,9 @@ require 'pluto/tasks'
 
 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
+require 'pluto/cli/sysinfo'
+require 'pluto/cli/updater'
+
 
 
 module Pluto

data/lib/pluto/cli/main.rb

@@ -20,66 +20,12 @@ opts    = Pluto::Opts.new
 
 
 
-class SysInfo
-  
-  ## todo/fix:
-  ##   pass in/use config (props)
-  
-  def initialize( opts )
-    @opts = opts
-  end
-  
-  attr_reader :opts
-
-
-  def dump
-  puts <<EOS
-
-#{Pluto.banner}
-
-Gems versions:
-  - pakman #{Pakman::VERSION}
-  - 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}
-
-EOS
-
-  # dump Pluto settings
-  # config.dump
-  # puts
-      
-
-  ## todo: add more gem version info
-  # todo: add  logutils version
-  #       add  gli2     version
-  end
-
-end # class SysInfo
-
-
-
 ######
 # begin
 #  move to pluto for reuse (e.g. in rakefile)
 
 def load_config( name )
-  extname = File.extname( name )   # return '' or '.ini' or '.yml' etc.
-
-  config = extname == '.ini' ? INI.load_file( name ) :
-                               YAML.load_file( name )
+  config = INI.load_file( name )
 
   puts "dump >#{name}<:"
   pp config
@@ -90,9 +36,8 @@ end
 
 def find_default_config_path
   candidates =  [ 'pluto.ini',
-                  'pluto.yml',
-                  'planet.ini',
-                  'planet.yml' ]
+                  'planet.ini'
+                   ]
 
   candidates.each do |candidate|
     return candidate  if File.exists?( candidate )   ## todo: use ./candidate -- why? why not??
@@ -104,11 +49,11 @@ end
 
 
 def find_config_path( name )
-  extname    = File.extname( name )   # return '' or '.ini' or '.yml' etc.
+  extname    = File.extname( name )   # return '' or '.ini' or '.conf' or '.cfg' or '.txt -???' etc.
 
   return name  if extname.present?    # nothing to do; extension already present
 
-  candidates = [ '.ini', '.yml' ]
+  candidates = [ '.ini' ]
 
   candidates.each do |candidate|
     return "#{name}#{candidate}"  if File.exists?( "#{name}#{candidate}" )
@@ -125,12 +70,13 @@ end
 ###########################
 
 
+
 def expand_config_args( args )
 
   # 1) no args - try to find default config e.g. pluto.ini etc.
-  if args.length == 0      
+  if args.length == 0
     new_arg = find_default_config_path
-    
+
     return [] if new_arg.nil?
     return [new_arg] # create a new args w/ one item e.g. ['pluto.yml']
   end
@@ -208,10 +154,10 @@ command [:fetch, :f] do |c|
       puts "feed_rec:"
       pp feed_rec
 
-      fetcher = Pluto::Fetcher.new
+      fetcher = Pluto::FeedFetcherBasic.new
       fetcher.debug = true  # by default debug is true (only used for debuggin! - save feed to file, etc.)
 
-      feed = fetcher.feed_by_rec( feed_rec )
+      feed = fetcher.fetch( feed_rec )
       ## pp feed
     end
 

data/lib/pluto/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2015-01-11 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.2.2
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: pluto-update
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.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.1.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement