pluto-tasks 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c6fa8bfc508ba077015ecabd24ed84585edd2a
-  data.tar.gz: b2de7d731cdc5a4e845cc7768bc10fd32e1facb2
+  metadata.gz: 722a8096832c7a5f54ae23aab76cbddb0744b25f
+  data.tar.gz: 3f63ca7694d8bf5159a14684c82f9b7b1559a5b7
 SHA512:
-  metadata.gz: f48824619f36a1c9874d5cc6353200db9981b69f687a61749385a4fa54d1b7edf24056728da3b5bd07d03eac3ddbf4c5c2ba061f2c94f31ed0c94d6485e7dee4
-  data.tar.gz: fd0a505d4bb2ff870bc874e3c69783e0290b1280682695bf59df917e019305b4593f5b70aa07db37655353b38d91bbbde57ecec7f09f1bb56acf7583ab52ef05
+  metadata.gz: af6934a8aeaaa49615518143b2a9764b1e960f35634365a7784cea269c2d9ba02c48d3c63050d6b5401cc48b4e59ba9435954e843c54c610ee728285526c52d9
+  data.tar.gz: 00428e151fda05dd168cda73a4dab4764112d9cd234166caea8bd263055524a4d2192a203263eb4a5e6e9938bc6a182c3214a36405c3728be7677a167feaa03e

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.spec 'pluto-tasks' do
 
   self.extra_deps = [
     ['pluto-models',  '>= 1.3.2'],
-    ['pluto-update',  '>= 1.3.0'],
+    ['pluto-update',  '>= 1.4.0'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/pluto/tasks/version.rb

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

data/lib/pluto/tasks.rb

@@ -10,6 +10,31 @@ require 'pluto/update'
 require 'pluto/tasks/version'   # note: let version always get first
 
 
+
+
+#############
+### todo/fix: use/find better name? - e.g. Fetcher.read_utf8!()  move out of global ns etc.
+###   e.g. use Fetch.read_utf8!()  e.g. throws exception on error
+##                   read_blob!()
+def fixme_fetcher_read_utf8!( src )
+  worker = Fetcher::Worker.new
+  res = worker.get_response( src )
+  if res.code != '200'
+    puts "sorry; failed to fetch >#{src} - 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
+  txt = res.body.to_s
+  txt = txt.force_encoding( Encoding::UTF_8 )
+  txt
+end
+
+
+
 module Pluto
 
   def self.load_tasks
@@ -21,6 +46,7 @@ module Pluto
   end
 
 
+
   ###
   ##  todo/fix: move to pluto-update for (re)use !!!!
   def self.fetch_config_for( key )
@@ -29,21 +55,7 @@ module Pluto
     ##  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 )
-
+    index_txt = fixme_fetcher_read_utf8!( 'https://raw.githubusercontent.com/feedreader/planets/master/pluto.index.ini' )
     shortcuts = INI.load( index_txt )
     pp shortcuts
 
@@ -53,19 +65,7 @@ module Pluto
       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_txt = InclPreproc.from_url( shortcut['source'] ).read
     config = INI.load( config_txt )
     config
   end # method fetch_config_for

data/test/test_fetch.rb

@@ -12,7 +12,7 @@ require 'helper'
 class TestFetch < MiniTest::Test
 
   def test_ruby
-    config = Pluto.fetch_config_for( 'ruby')
+    config = Pluto.fetch_config_for( 'ruby' )
     pp config
 
     assert true    ## if we get here it should work

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-tasks
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement