pluto 1.0.1 → 1.1.0

data/lib/pluto/cli/opts.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pluto
 
 class Opts
@@ -66,7 +68,8 @@ class Opts
   end
 
   def load_shortcuts
-    @shortcuts = YAML.load_file( "#{Pluto.root}/config/pluto.index.yml" )
+    ### Note: for now shortcuts packed w/ pluto-merge  - move to pluto (this gem??) why? why not?
+    @shortcuts = YAML.load_file( "#{PlutoMerge.root}/config/pluto.index.yml" )
   end
 
   def map_fetch_shortcut( key )

data/lib/pluto/cli/version.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+module PlutoCli
+
+  MAJOR = 1
+  MINOR = 1
+  PATCH = 0
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+  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.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
+  end
+
+end # module PlutoCli
+

metadata

@@ -1,126 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pakman
-  requirement: &72026150 !ruby/object:Gem::Requirement
-    none: false
+  name: pluto-models
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *72026150
-- !ruby/object:Gem::Dependency
-  name: fetcher
-  requirement: &72025920 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *72025920
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: &72025620 !ruby/object:Gem::Requirement
-    none: false
+  name: pluto-update
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72025620
-- !ruby/object:Gem::Dependency
-  name: feedutils
-  requirement: &72025240 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *72025240
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: props
-  requirement: &72024910 !ruby/object:Gem::Requirement
-    none: false
+  name: pluto-merge
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72024910
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: textutils
-  requirement: &72024550 !ruby/object:Gem::Requirement
-    none: false
+  name: pluto-tasks
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72024550
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: activityutils
-  requirement: &72024270 !ruby/object:Gem::Requirement
-    none: false
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.12.2
   type: :runtime
   prerelease: false
-  version_requirements: *72024270
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
-  name: gli
-  requirement: &72024020 !ruby/object:Gem::Requirement
-    none: false
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72024020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72023760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *72023760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &72023540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *72023540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: feedreader@googlegroups.com
@@ -128,68 +129,43 @@ executables:
 - pluto
 extensions: []
 extra_rdoc_files:
+- HISTORY.md
 - Manifest.txt
+- README.md
 files:
 - HISTORY.md
 - 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
-- .gemtest
+- lib/pluto/cli/version.rb
 homepage: https://github.com/feedreader/pluto
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: pluto
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: pluto - Another Planet Generator
-test_files:
-- test/test_helpers.rb
+test_files: []

data/config/pluto.index.yml

@@ -1,23 +0,0 @@
-#########################################
-# Pluto Update Index for Template Packs
-
-
-#############
-# shortcuts for fetching template packs
-#   maps shortcut to URI
-
-blank: https://raw.github.com/feedreader/pluto.blank/master/blank.txt
-
-top: https://raw.github.com/feedreader/pluto.top/master/top.txt
-
-news: https://raw.github.com/feedreader/pluto.news/master/news.txt
-
-feeds: https://raw.github.com/feedreader/pluto.feeds/master/feeds.txt
-
-classic: https://raw.github.com/feedreader/pluto.classic/master/classic.txt
-
-
-####
-# all:
-#   - add why? why not??
-#

data/lib/pluto/activerecord.rb

@@ -1,18 +0,0 @@
-module Pluto
-
-module ActiveRecordMethods
-
-  def read_attribute_w_fallbacks( *keys )
-    ### todo: use a different name e.g.:
-    ##   read_attribute_cascade ??  - does anything like this exists already?
-    ## why? why not?
-    keys.each do |key|
-      value = read_attribute( key )
-      return value unless value.nil?
-    end
-    value # fallthrough? return latest value (will be nil)
-  end
-
-
-end # module ActiveRecordMethods
-end # module Pluto

data/lib/pluto/connecter.rb

@@ -1,96 +0,0 @@
-module Pluto
-
-
-# DB Connecter / Connection Manager
-#   lets you establish connection 
-
-class Connecter
-
-  include LogUtils::Logging
-
-  def initialize
-    # do nothing for now
-  end
-
-
-  def debug=(value)
-    @debug = value
-  end
-
-  def debug?
-    @debug || false
-  end
-
-
-  def connect!( config = nil )
-
-    if config.nil?   # use/try DATABASE_URL from environment
-
-      logger.debug "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
-
-      db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///pluto.db' )
-
-      if db.scheme == 'postgres'
-        config = {
-          adapter:  'postgresql',
-          host:     db.host,
-          port:     db.port,
-          username: db.user,
-          password: db.password,
-          database: db.path[1..-1],
-          encoding: 'utf8'
-        }
-      else   # assume sqlite3
-        config = {
-          adapter:  db.scheme,       # sqlite3
-          database: db.path[1..-1]   # pluto.db (NB: cut off leading /, thus 1..-1)
-        }
-      end
-    end  # if config.nil?
-
-    puts 'db settings:'
-    pp config
-
-    ### for dbbrowser and other tools add to ActiveRecord
-    
-    if ActiveRecord::Base.configurations.nil?   # todo/check: can this ever happen? remove?
-       puts "ActiveRecord configurations nil - set to empty hash"
-       ActiveRecord::Base.configurations = {}  # make it an empty hash
-    end
-
-    if debug?
-      puts 'ar configurations (before):'
-      pp ActiveRecord::Base.configurations
-    end
-    
-    # note: for now always use pluto key for config storage
-    ActiveRecord::Base.configurations['pluto'] = config
-
-    if debug?
-      puts 'ar configurations (after):'
-      pp ActiveRecord::Base.configurations
-    end
-
-
-    # for debugging - disable for production use
-    if debug?
-      ActiveRecord::Base.logger = Logger.new( STDOUT ) 
-    end
-
-
-    ActiveRecord::Base.establish_connection( config )
-
-    # first time? - auto-run db migratation, that is, create db tables
-    unless ActivityDb::Models::Activity.table_exists?
-      ActivityDb::CreateDb.new.up
-    end
-
-    unless Models::Feed.table_exists?
-      CreateDb.new.up  
-    end
-  end # method connect!
-
-
-end # class Connecter
-
-end # module Pluto