pluto 0.7.0 → 0.8.0

data/lib/pluto/cli/opts.rb

@@ -2,12 +2,27 @@ module Pluto
 
 class Opts
 
+  def initialize
+    load_shortcuts
+  end
+
+
+  def merge_gli_options!( options={} )
+    @verbose = true     if options[:verbose] == true
+    
+    @config_path = options[:config]    if options[:config].present?
+    @output_path = options[:output]    if options[:output].present?
+    
+    @manifest       =   options[:template]  if options[:template].present?
+  end
+
+
   def manifest=(value)
     @manifest = value
   end
   
   def manifest
-    @manifest || 'blank.txt'   ## todo - just return blank  (no .txt extension - possible?)
+    @manifest || 'blank'
   end
 
   def verbose=(value)
@@ -23,7 +38,8 @@ class Opts
   end
   
   def config_path
-    @config_path || '~/.pluto'
+    ## @config_path || '~/.pluto'   --- old code
+    @config_path || File.join( Env.home, '.pluto' )
   end
 
 
@@ -35,6 +51,26 @@ class Opts
     @output_path || '.'
   end
 
+  def load_shortcuts
+    @shortcuts = YAML.load_file( "#{Pluto.root}/config/pluto.index.yml" )
+  end
+
+  def map_fetch_shortcut( key )
+    # NB: always returns an array!!!  0,1 or more entries
+    # - no value - return empty ary
+    
+    ## todo: normalize key???
+    value = @shortcuts.fetch( key, nil )
+    
+    if value.nil?
+      []
+    elsif value.kind_of?( String )
+      [value]
+    else  # assume it's an array already;  ## todo: check if it's an array
+      value
+    end
+  end
+
 
 end # class Opts
 

data/lib/pluto/formatter.rb

@@ -5,7 +5,7 @@ class Formatter
   include LogUtils::Logging
 
   include Models
-
+  include ManifestHelper
 
   def initialize( opts, config )
     @opts    = opts
@@ -28,10 +28,23 @@ class Formatter
     manifests = installed_template_manifests.select { |m| m[0] == manifest_name+'.txt' }
         
     if manifests.empty?
-      puts "*** error: unknown template pack '#{manifest_name}'; use pluto -l to list installed template packs"
-      exit 2
+      
+      ### try - autodownload
+      puts "*** template pack '#{manifest_name}' not found; trying auto-install..."
+      
+      Installer.new( opts ).install( manifest_name )
+
+      ### try again
+      
+      # check for matching manifests
+      manifests = installed_template_manifests.select { |m| m[0] == manifest_name+'.txt' }
+      
+      if manifests.empty?
+         puts "*** error: unknown template pack '#{manifest_name}'; use pluto ls to list installed template packs"
+         exit 2
+      end
     end
-        
+
     manifestsrc = manifests[0][1]
     pakpath     = opts.output_path
     
@@ -40,41 +53,6 @@ class Formatter
     Pakman::Templater.new.merge_pak( manifestsrc, pakpath, binding, name )
   end
 
-private
-
-  def installed_template_manifest_patterns
-
-    # 1) search .    # that is, working/current dir
-    # 2) search <config_dir>
-    # 3) search <gem>/templates
-
-    builtin_patterns = [
-      "#{Pluto.root}/templates/*.txt"
-    ]
-    config_patterns  = [
-      "#{File.expand_path(opts.config_path)}/*.txt",
-      "#{File.expand_path(opts.config_path)}/*/*.txt"
-    ]
-    current_patterns = [
-      "*.txt",
-      "*/*.txt"
-    ]
-    
-    patterns = []
-    patterns += current_patterns
-    patterns += config_patterns
-    patterns += builtin_patterns
-  end
-
-  def installed_template_manifests
-    excludes = [
-      "Manifest.txt",
-      "*/Manifest.txt"
-    ]    
-    
-    Pakman::Finder.new.find_manifests( installed_template_manifest_patterns, excludes )
-  end
-
 end # class Formatter
 
 end # module Pluto

data/lib/pluto/installer.rb

@@ -0,0 +1,58 @@
+module Pluto
+
+class Installer
+
+### fix: remove opts, use config (wrapped!!)
+  
+  include LogUtils::Logging
+  
+  def initialize( opts )
+    @opts    = opts
+  end
+
+  attr_reader :opts
+
+
+  def install( shortcut_or_source )
+
+    logger.debug "fetch >#{shortcut_or_source}<"
+    
+    ## check for builtin shortcut (assume no / or \) 
+    if shortcut_or_source.index( '/' ).nil? && shortcut_or_source.index( '\\' ).nil?
+      shortcut = shortcut_or_source
+      sources = opts.map_fetch_shortcut( shortcut )
+
+      if sources.empty?
+        puts "** Error: No mapping found for shortcut '#{shortcut}'."
+        return
+      end
+      puts "  Mapping fetch shortcut '#{shortcut}' to: #{sources.join(',')}"
+    else
+      sources = [shortcut_or_source]  # pass arg through unmapped
+    end
+
+    sources.each do |source|
+      install_template( source )
+    end
+
+  end # method run
+
+
+  def install_template( src )
+    # src = 'http://github.com/geraldb/slideshow/raw/d98e5b02b87ee66485431b1bee8fb6378297bfe4/code/templates/fullerscreen.txt'
+    # src = 'http://github.com/geraldb/sandbox/raw/13d4fec0908fbfcc456b74dfe2f88621614b5244/s5blank/s5blank.txt'
+    uri = URI.parse( src )
+    logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
+
+    pakname = File.basename( uri.path ).downcase.gsub('.txt','')
+    pakpath = File.expand_path( "#{opts.config_path}/#{pakname}" )
+    
+    logger.debug "packname >#{pakname}<"
+    logger.debug "pakpath >#{pakpath}<"
+  
+    Pakman::Fetcher.new.fetch_pak( src, pakpath )
+  end
+
+end # class Installer
+
+end # module Pluto

data/lib/pluto/lister.rb

@@ -0,0 +1,42 @@
+module Pluto
+
+class Lister
+
+  include LogUtils::Logging
+
+  include ManifestHelper
+
+  def initialize( opts )
+    @opts    = opts
+  end
+
+  attr_reader :opts
+
+  def list
+    home = Env.home
+    ## replace home w/ ~ (to make out more readable (shorter))
+    ## e.g. use gsub( home, '~' )
+
+    puts ''
+    puts 'Installed template packs in search path'
+    
+    installed_template_manifest_patterns.each_with_index do |pattern,i|
+      puts "    [#{i+1}] #{pattern.gsub(home,'~')}"
+    end
+    puts '  include:'
+    
+    manifests = installed_template_manifests
+    if manifests.empty?
+      puts "    -- none --"
+    else
+      manifests.each do |manifest|
+        pakname      = manifest[0].gsub('.txt','')
+        manifestpath = manifest[1].gsub(home,'~')
+        puts "%16s (%s)" % [pakname,manifestpath]
+      end
+    end
+  end # method list
+
+end # class Lister
+
+end # module Pluto

data/lib/pluto/manifest_helpers.rb

@@ -0,0 +1,50 @@
+module Pluto
+
+module ManifestHelper
+
+  ## shared methods for handling manifest lookups
+  ##
+  #  note: required attribs (in host class) include:
+  #     - opts.config_path
+  
+  def installed_template_manifest_patterns
+
+    # 1) search .    # that is, working/current dir
+    # 2) search <config_dir>
+    # 3) search <gem>/templates
+
+### 
+# Note
+# -- for now - no longer ship w/ builtin template packs
+# - download on demand if needed
+
+    builtin_patterns = [
+##      "#{Pluto.root}/templates/*.txt"
+    ]
+    config_patterns  = [
+##      "#{File.expand_path(opts.config_path)}/*.txt",
+      "#{File.expand_path(opts.config_path)}/*/*.txt"
+    ]
+    current_patterns = [
+##      "*.txt",
+      "*/*.txt"
+    ]
+    
+    patterns = []
+    patterns += current_patterns
+    patterns += config_patterns
+    patterns += builtin_patterns
+  end
+
+  def installed_template_manifests
+    excludes = [
+      "Manifest.txt",
+      "*/Manifest.txt"
+    ]    
+    
+    Pakman::Finder.new.find_manifests( installed_template_manifest_patterns, excludes )
+  end
+
+
+end # module Manifest
+end # module Slideshow

data/lib/pluto/models.rb

@@ -1,13 +1,42 @@
 module Pluto
   module Models
-  
+
 class Feed < ActiveRecord::Base
   self.table_name = 'feeds'
-  
+
   has_many :items
   has_many :subscriptions
   has_many :sites, :through => :subscriptions
-end
+
+
+  def self.latest
+    # note: order by first non-null datetime field
+    #   coalesce - supported by sqlite (yes), postgres (yes)
+
+    # note: if not published_at,touched_at or built_at use hardcoded 1999-01-01 for now
+    order( "coalesce(published_at,touched_at,built_at,'1999-01-01') desc" )
+  end
+
+
+  def published_at?
+    read_attribute(:published_at).present?
+  end
+
+  def published_at
+    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
+    #    db backed attribute
+
+    if read_attribute(:published_at).present?
+      read_attribute(:published_at)
+    elsif read_attribute(:touched_at).present?
+      ## try touched_at (aka updated (ATOM))
+      read_attribute(:touched_at)
+    else  ## try build_at (aka lastBuildDate (RSS))
+      read_attribute(:built_at)
+    end
+  end
+
+end  # class Feed
 
 class Item < ActiveRecord::Base
   self.table_name = 'items'
@@ -15,9 +44,30 @@ class Item < ActiveRecord::Base
   belongs_to :feed
   
   def self.latest
-    order( 'published_at desc' )
+    # note: order by first non-null datetime field
+    #   coalesce - supported by sqlite (yes), postgres (yes)
+
+    # note: if not published_at,touched_at or built_at use hardcoded 1999-01-01 for now
+    order( "coalesce(published_at,touched_at,'1999-01-01') desc" )
   end
-end
+
+  def published_at?
+    read_attribute(:published_at).present?
+  end
+
+  def published_at
+    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
+    #    db backed attribute
+
+    if read_attribute(:published_at).present?
+      read_attribute(:published_at)
+    else  ## try touched_at (aka updated)
+      read_attribute(:touched_at)
+    end
+  end
+
+end  # class Item
+
 
 class Site < ActiveRecord::Base
   self.table_name = 'sites'
@@ -33,6 +83,11 @@ class Subscription < ActiveRecord::Base
   belongs_to :feed
 end
 
+class Action < ActiveRecord::Base
+  self.table_name = 'actions'
+
+end
+
 
   end # module Models
 end # module Pluto

data/lib/pluto/schema.rb

@@ -5,9 +5,11 @@ class CreateDb < ActiveRecord::Migration
     
   def up
     create_table :sites do |t|
-      t.string  :title,    :null => false    # e.g Planet Ruby, Planet JavaScript, etc.
-      t.string  :key,      :null => false    # e.g. ruby, js, etc.
-      t.timestamps
+      t.string   :title,     :null => false    # e.g Planet Ruby, Planet JavaScript, etc.
+      t.string   :key,       :null => false    # e.g. ruby, js, etc.
+      t.datetime :fetched_at   #  last fetched/checked date -- make not null ??
+
+      t.timestamps  # created_at, updated_at
     end
 
     create_table :subscriptions do |t|   # has_many join table (sites/feeds)
@@ -18,21 +20,51 @@ class CreateDb < ActiveRecord::Migration
 
     create_table :feeds do |t|
       t.string  :title,    :null => false
+      t.string  :title2     # e.g. subtitle (atom)
+      t.text    :summary    # e.g. description (rss)
       t.string  :url,      :null => false
       t.string  :feed_url, :null => false
+      t.string  :generator   # feed generator (e.g. wordpress, etc.)  from feed
+      
+      t.datetime :published_at  # from feed published(atom)+ pubDate(rss)
+      t.datetime :built_at      # from feed lastBuiltDate(rss)
+      t.datetime :touched_at    # from feed updated(atom)
+
+      # -- our own (meta) fields
       t.string  :key,      :null => false
-      t.timestamps
+      t.string  :format      # e.g. atom (1.0), rss 2.0, rss 0.7 etc.
+      t.string  :etag      # last etag
+      t.datetime :fetched_at    # last fetched/checked date
+      t.timestamps   # created_at, updated_at
     end
 
     create_table :items do |t|
       t.string   :title   # todo: add some :null => false ??
-      t.string   :url
       t.string   :guid
+      t.string   :url
+      t.text     :summary  # e.g. description (rss), summary (atom)
       t.text     :content
-      t.datetime :published_at
+      
+      t.datetime :published_at   # from feed (published)  + pubDate(rss)
+      t.datetime :touched_at     # from feed updated (atom)
+
+      ## todo: add :last_updated_at ??  (NOTE: updated_at already take by auto-timestamps)
       t.references :feed, :null => false
+
+      t.datetime :fetched_at   # last fetched/check date
+      t.timestamps   # created_at, updated_at
+      
+      ## t.string   :author
+      ## todo: add author/authors, category/categories
+    end
+
+    create_table :actions do |t|
+      t.string   :title                # e.g. new site, new subscription, update feeds, etc.
+      t.string   :object            # todo: find better names for action attribs ??
+      t.string   :object_type
       t.timestamps
     end
+    
   end
     
   def down