pluto-tasks 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb84bb53573bcc450ab3b5b2224cd05adcc0ad39
-  data.tar.gz: 571764b7b5352531055601ed8ccf2cf819104206
+  metadata.gz: 059a295456b18d6271c84dc93ba338592df9f6b2
+  data.tar.gz: 30c0be966e25c2581a267ea0af2249ca7ae17d9f
 SHA512:
-  metadata.gz: 71cecfcfa4fa750a4a1bea97c4d3c74d4b5351e132e6c6e751ddae5c510762680c58b7664f634632f6a30c11520e3d84d752e1e95ed58e58c92c6c15db7d3e6f
-  data.tar.gz: 4a5e7123715b423f584a844fda57ddd687ebf0ccbf917975e82877fcecc284bed4767601573175204f98e7292ad2219663023c88e6686a9ae4093b474b53947d
+  metadata.gz: fea778a60a8f1e97528c5eacd8778d9f094d65185fc92a11d2135c243ffaf8946112d6cdfae3888ecfb57d8d6e758aa3a3b6d411e5e55dd6cc204696531aca8e
+  data.tar.gz: 6ac7aa1a7cad2b317d535d273da432fba198f269b638091863cd9d060330986dc025cbeb5f8a0a93f8b4deaf6dc120258bbcea39078c3fd0b2865c2c6cf4f415

data/README.md

@@ -10,6 +10,22 @@
 
 ## Usage
 
+### Tasks
+
+Setup • Update • Stats
+
+
+#### Setup Task
+
+Setup the database and planet feed subscriptions:
+
+    $ rake setup PLANET=ruby
+
+#### Update Task
+
+Update your planet feeds:
+
+    $ rake update
 
 
 ## License

data/Rakefile

@@ -18,9 +18,8 @@ Hoe.spec 'pluto-tasks' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['pluto-models',  '>= 1.2.2'],
+    ['pluto-models',  '>= 1.3.1'],
     ['pluto-update'],
-    ['pluto-merge'],   ## todo/check: add merge - why? why not?
   ]
 
   self.licenses = ['Public Domain']

data/lib/pluto/tasks.rb

@@ -2,9 +2,7 @@
 
 
 require 'pluto/models'
-
 require 'pluto/update'
-require 'pluto/merge'      ## todo/check: add merge - really used- why? why not?
 
 
 # our own code
@@ -22,6 +20,55 @@ module Pluto
     load 'pluto/tasks/update.rake'
   end
 
+
+  def self.fetch_config_for( key )
+    ###
+    ## todo:
+    ##  move into a method for (re)use
+    puts "trying to fetch pluto.index.ini shortcut planet registry..."
+
+    ## Note: Pluto includes its own Fetcher, thus, use ::Fetcher!!
+    worker = ::Fetcher::Worker.new
+    res = worker.get_response( 'https://raw.githubusercontent.com/feedreader/planets/master/pluto.index.ini' )
+    if res.code != '200'
+      puts "sorry; failed to fetch pluto.index - HTTP #{res.code} - #{res.message}"
+      exit 1
+    end
+
+    ###
+    # Note: Net::HTTP will NOT set encoding UTF-8 etc.
+    #  will be set to ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
+    #  thus, set/force encoding to utf-8
+    index_txt = res.body.dup.to_s
+    index_txt = index_txt.force_encoding( Encoding::UTF_8 )
+
+    shortcuts = INI.load( index_txt )
+    pp shortcuts
+
+    shortcut = shortcuts[key]
+    if shortcut.nil?
+      puts "sorry; no planet shortcut found for key >#{key}<"
+      exit 1
+    end
+
+    res = worker.get_response( shortcut['source'] )
+    if res.code != '200'
+      puts "sorry; failed to fetch planet config for >#{key}< - HTTP #{res.code} - #{res.message}"
+      exit 1
+    end
+
+    ###
+    # Note: Net::HTTP will NOT set encoding UTF-8 etc.
+    #  will be set to ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
+    #  thus, set/force encoding to utf-8
+    config_txt = res.body.dup.to_s
+    config_txt = config_txt.force_encoding( Encoding::UTF_8 )
+
+    config = INI.load( config_txt )
+    config
+  end # method fetch_config_for
+
+
 end  # module Pluto
 
 

data/lib/pluto/tasks/env.rake

@@ -12,7 +12,7 @@ end
 
 desc 'pluto - debug site setup'
 task :site => :env do
-  site = Pluto::Models::Site.first      # FIX: for now assume one planet per DB (fix later; allow planet key or similar)
+  site = Pluto::Model::Site.first      # FIX: for now assume one planet per DB (fix later; allow planet key or similar)
   if site.present?
     puts "site found:"
     pp site

data/lib/pluto/tasks/setup.rake

@@ -11,12 +11,13 @@ task :setup => :env do
     puts 'no PLANET=key passed along; try defaults'
     # try pluto.yml or planet.yml if exist
 
-    if File.exists?( './pluto.ini' ) || File.exists?( './pluto.yml' ) # check if pluto.yml exists, if yes add/use it
+    if File.exists?( './pluto.ini' ) # check if pluto.ini exists, if yes add/use it
       key ='pluto'
-    elsif File.exists?( './planet.ini' ) || File.exists?( './planet.yml' ) # check if planet.yml exists, if yes add/use it
+    elsif File.exists?( './planet.ini' )  # check if planet.ini exists, if yes add/use it
       key = 'planet'
     else
-      puts '*** note: no arg passed in; no pluto.ini|yml or planet.ini|yml found in working folder'
+      puts '*** error: no arg passed in; no pluto.ini or planet.ini found in working folder'
+      exit 1
     end
   end
 
@@ -24,13 +25,11 @@ task :setup => :env do
   config_path = "./#{key}.ini"
   if File.exists?( config_path )
     config = INI.load_file( config_path )
-  else  ## assume .yml
-    config_path = "./#{key}.yml"
-    config = YAML.load_file( config_path )
+  else  ## try download shortcut index list and fetch planet config
+    config = Pluto.fetch_config_for( key )
   end
-  
 
-  puts "dump planet setup settings >#{config_path}<:"
+  puts "dump planet setup settings:"
   pp config
 
   # note: allow multiple planets (sites) for a single install

data/lib/pluto/tasks/stats.rake

@@ -3,8 +3,9 @@
 desc 'pluto - show planet (feed) stats'
 task :stats => :env do
   puts "stats:"
-  puts "  Feeds: #{Pluto::Models::Feed.count}"
-  puts "  Items: #{Pluto::Models::Item.count}"
-  puts "  Sites: #{Pluto::Models::Site.count}"
-  puts "  Subscriptions:  #{Pluto::Models::Subscription.count}"
+  puts "  Feeds: #{Pluto::Model::Feed.count}"
+  puts "  Items: #{Pluto::Model::Item.count}"
+  puts "  Sites: #{Pluto::Model::Site.count}"
+  puts "  Subscriptions:  #{Pluto::Model::Subscription.count}"
 end
+

data/lib/pluto/tasks/version.rb

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

data/test/test_fetch.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_fetch.rb
+#  or better
+#     rake test
+
+require 'helper'
+
+
+class TestFetch < MiniTest::Test
+
+  def test_ruby
+    config = Pluto.fetch_config_for( 'ruby')
+    pp config
+
+    assert true    ## if we get here it should work
+  end
+
+end # class TestFetch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-tasks
 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: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: pluto-update
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pluto-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +75,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
+- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -99,6 +86,7 @@ files:
 - lib/pluto/tasks/stats.rake
 - lib/pluto/tasks/update.rake
 - lib/pluto/tasks/version.rb
+- test/test_fetch.rb
 homepage: https://github.com/feedreader/pluto-tasks
 licenses:
 - Public Domain
@@ -125,4 +113,5 @@ rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: pluto-tasks - planet rake tasks (setup, update, stats, etc.)
-test_files: []
+test_files:
+- test/test_fetch.rb