pakman 0.4.0 → 0.5.0

data/README.markdown

@@ -1,25 +1,30 @@
-## `pakman` - Template Pack Manager in Ruby
+# `pakman` - Template Pack Manager in Ruby
+
+
+* home :: [github.com/geraldb/pakman](https://github.com/geraldb/pakman)
+* bugs :: [github.com/geraldb/pakman/issues](https://github.com/geraldb/pakman/issues)
+* gem  :: [rubygems.org/gems/pakman](https://rubygems.org/gems/pakman)
+* rdoc :: [rubydoc.info/gems/pakman](http://rubydoc.info/gems/pakman)
 
-* [geraldb.github.com/pakman](http://geraldb.github.com/pakman)
 
 ## Usage - Ruby Code
 
 Fetch a template pack:
 
 ```ruby
-Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+Pakman::Fetcher.new.fetch_pak( src, pakpath )
 ```
 
 Copy a template pack from your cache:
 
 ```ruby
-Pakman::Copier.new( logger ).copy_pak( src, pakpath )
+Pakman::Copier.new.copy_pak( src, pakpath )
 ```
 
 Merge a template pack from your cache:
 
 ```ruby
-Pakman::Templater.new( logger ).merge_pak( src, pakpath, binding, name )
+Pakman::Templater.new.merge_pak( src, pakpath, binding, name )
 ```
 
 
@@ -33,7 +38,7 @@ patterns  = [
   "*/*.txt"
 ]
 
-Pakman::Finder.new( logger ).find_manifests( patterns )
+Pakman::Finder.new.find_manifests( patterns )
 ```
 
 
@@ -64,15 +69,16 @@ Just install the gem:
 
 ## Real World Usage
 
-The [`slideshow`](http://slideshow.rubyforge.org) (also known as Slide Show (S9)) gem
+The [`slideshow`](http://slideshow-s9.github.io) (also known as Slide Show (S9)) gem
 that lets you create slide shows
 and author slides in plain text using a wiki-style markup language that's easy-to-write and easy-to-read.
 
 ## Real World Template Packs
 
-* [S6 Template Pack](https://github.com/geraldb/slideshow-s6-blank)
-* [impress.js Template Pack](https://github.com/geraldb/slideshow-impress.js)
-* [deck.js Template Pack](https://github.com/geraldb/slideshow-deck.js)
+* [S6 Template Pack](https://github.com/slideshow-s9/slideshow-s6-blank)
+* [impress.js Template Pack](https://github.com/slideshow-s9/slideshow-impress.js)
+* [deck.js Template Pack](https://github.com/slideshow-s9/slideshow-deck.js)
+
 
 ## License
 

data/Rakefile

@@ -8,17 +8,18 @@ Hoe.spec 'pakman' do
   self.summary = 'pakman - Template Pack Manager'
   self.description = summary
   
-  self.urls    = ['http://geraldb.github.com/pakman']
-  
+  self.urls    = ['https://github.com/geraldb/pakman']
+
   self.author  = 'Gerald Bauer'
   self.email   = 'webslideshow@googlegroups.com'
   
   self.extra_deps = [
-    ['fetcher','>= 0.1.0']
+    ['fetcher',  '>= 0.3.0'],
+    ['logutils', '>= 0.6.0']
   ]
-    
+
   # switch extension to .rdoc for gihub formatting
   self.readme_file  = 'README.markdown'
   self.history_file = 'History.markdown'
 
-end
+end

data/lib/pakman.rb

@@ -1,7 +1,6 @@
 ###
 # NB: for local testing run like:
 #
-# 1.8.x: ruby -Ilib -rrubygems lib/pakman.rb
 # 1.9.x: ruby -Ilib lib/pakman.rb
 
 # core and stlibs
@@ -15,8 +14,10 @@ require 'fileutils'
 
 # rubygems
 
+require 'logutils'
 require 'fetcher'   # fetch (download) files
 
+
 # our own code
 
 require 'pakman/copier'

data/lib/pakman/cli/commands/fetch.rb

@@ -2,13 +2,14 @@ module Pakman
 
 class Fetch
 
-  attr_reader :logger, :opts
+  include LogUtils::Logging
 
-  def initialize( logger, opts )
-    @logger  = logger
-    @opts    = opts
+  def initialize( opts )
+    @opts = opts
   end
 
+  attr_reader :opts
+
   def run
     logger.debug "fetch_uri: >#{opts.fetch_uri}<"
     src = opts.fetch_uri
@@ -22,7 +23,7 @@ class Fetch
     pakpath = File.expand_path( pakname, opts.config_path )
     logger.debug "pakpath: >#{pakpath}<"
 
-    Fetcher.new( logger ).fetch_pak( src, pakpath )
+    Fetcher.new.fetch_pak( src, pakpath )
   end # method run
 
 end # class Fetch

data/lib/pakman/cli/commands/gen.rb

@@ -1,15 +1,16 @@
 module Pakman
 
 class Gen
-  
+
+  include LogUtils::Logging
+
   include ManifestHelper
 
-  def initialize( logger, opts )
-    @logger  = logger
+  def initialize( opts )
     @opts    = opts
   end
 
-  attr_reader :logger, :opts
+  attr_reader :opts
 
   def run( args )
     manifest_name = opts.manifest
@@ -29,14 +30,14 @@ class Gen
     pakpath     = opts.output_path
     
     if args.empty?
-      Copier.new( logger ).copy_pak( manifestsrc, pakpath )
+      Copier.new.copy_pak( manifestsrc, pakpath )
     else
       args.each do |arg|
         data = YAML.load_file( arg )
         name = File.basename( arg, '.*' )
         puts "#{name}:"
         pp data
-        Templater.new( logger ).merge_pak( manifestsrc, pakpath, Ctx.new(data).ctx, name )
+        Templater.new.merge_pak( manifestsrc, pakpath, Ctx.new(data).ctx, name )
       end
     end
     

data/lib/pakman/cli/commands/list.rb

@@ -2,14 +2,15 @@ module Pakman
 
 class List
 
+  include LogUtils::Logging
+
   include ManifestHelper
 
-  def initialize( logger, opts )
-    @logger  = logger
-    @opts    = opts
+  def initialize( opts )
+    @opts = opts
   end
 
-  attr_reader :logger, :opts
+  attr_reader :opts
 
   def run
     manifests = installed_template_manifests

data/lib/pakman/cli/helpers.rb

@@ -30,8 +30,8 @@ module ManifestHelper
       "Manifest.txt",
       "*/Manifest.txt"
     ]    
-    
-    Finder.new( logger ).find_manifests( installed_template_manifest_patterns, excludes )
+
+    Finder.new.find_manifests( installed_template_manifest_patterns, excludes )
   end
 
 end # module ManifestHelper

data/lib/pakman/cli/runner.rb

@@ -2,14 +2,13 @@ module Pakman
 
 class Runner
 
-  def initialize
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
+  include LogUtils::Logging
 
-    @opts    = Opts.new
+  def initialize
+    @opts = Opts.new
   end
 
-  attr_reader :logger, :opts
+  attr_reader :opts
 
   def run( args )
     opt=OptionParser.new do |cmd|
@@ -39,8 +38,9 @@ class Runner
       end
 
       cmd.on( "--verbose", "Show debug trace" )  do
-        logger.datetime_format = "%H:%H:%S"
-        logger.level = Logger::DEBUG
+        ## logger.datetime_format = "%H:%H:%S"
+        ## logger.level = Logger::DEBUG
+        # fix: use logutils - set to debug
       end
 
       cmd.on_tail( "-h", "--help", "Show this message" ) do
@@ -72,15 +72,15 @@ EOS
     end
 
     opt.parse!( args )
-  
+
     puts Pakman.banner
-    
+
     if opts.list?
-      List.new( logger, opts ).run
+      List.new( opts ).run
     elsif opts.generate?
-      Gen.new( logger, opts ).run( args )
+      Gen.new( opts ).run( args )
     elsif opts.fetch?
-      Fetch.new( logger, opts ).run
+      Fetch.new( opts ).run
     else
       puts "-- No command do nothing for now.  --"  ## run help??
       puts "Done."

data/lib/pakman/copier.rb

@@ -2,12 +2,19 @@ module Pakman
 
 class Copier
 
-  attr_reader :logger
-    
-  def initialize( logger )
-    @logger   = logger
+  include LogUtils::Logging
+
+### todo/fix:
+# remove logger from c'tor
+# use logutils instead
+
+  def initialize( old_logger_do_not_use=nil )
+    if old_logger_do_not_use != nil
+         puts "*** depreciated API call [Pakman::Copier.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
+    end
   end
 
+
   def copy_pak( manifestsrc, pakpath )
 
     start = Time.now
@@ -16,7 +23,8 @@ class Copier
 
     puts "Copying template pack '#{pakname}'"
 
-    manifest = Manifest.load_file( logger, manifestsrc )
+    ## todo: after depreciate change back to just load_file
+    manifest = Manifest.load_file_v2( manifestsrc )
 
     manifest.each do |entry|
       dest   = entry[0]

data/lib/pakman/fetcher.rb

@@ -2,12 +2,17 @@ module Pakman
 
 class Fetcher
 
-  attr_reader :logger
-    
-  def initialize( logger )
-    @logger   = logger
-  end
+  include LogUtils::Logging
 
+### todo/fix:
+# remove logger from c'tor
+# use logutils instead
+
+  def initialize( old_logger_do_not_use=nil )
+    if old_logger_do_not_use != nil
+         puts "*** depreciated API call [Pakman::Fetcher.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
+    end
+  end
 
   def fetch_pak( manifestsrc, pakpath )
 
@@ -43,7 +48,8 @@ class Fetcher
 
     fetch_file( manifestsrc, manifestdest )
 
-    manifest = Manifest.load_file_core( logger, manifestdest )
+    ## todo: change back to load_file_core after deprecated api got removed
+    manifest = Manifest.load_file_core_v2( manifestdest )
       
     # step 2: download files & templates listed in manifest
     manifest.each do |entry|
@@ -76,7 +82,7 @@ private
      ## note: code moved to its own gem, that is, fetcher
      ## see https://github.com/geraldb/fetcher
     
-    ::Fetcher::Worker.new( logger ).copy( src, dest )
+    ::Fetcher::Worker.new.copy( src, dest )
   end
 
 end # class Fetcher

data/lib/pakman/finder.rb

@@ -2,10 +2,16 @@ module Pakman
 
 class Finder
 
-  attr_reader :logger
-    
-  def initialize( logger )
-    @logger = logger
+  include LogUtils::Logging
+
+### todo/fix:
+# remove logger from c'tor
+# use logutils instead
+
+  def initialize( old_logger_do_not_use=nil )
+    if old_logger_do_not_use != nil
+         puts "*** depreciated API call [Pakman::Finder.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
+    end
   end
 
   def find_manifests( patterns, excludes=[] )

data/lib/pakman/manifest.rb

@@ -2,25 +2,53 @@ module Pakman
 
 class Manifest
 
-  attr_reader :logger
-    
-  def initialize( logger )
-    @logger   = logger
+  include LogUtils::Logging
+
+### todo/fix:
+# remove logger from c'tor
+# use logutils instead
+
+  def initialize( old_logger_do_not_use=nil )
+    if old_logger_do_not_use != nil
+         puts "*** depreciated API call [Pakman::Manifest.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
+    end
+
     @manifest = []
   end
 
-  def self.load_file_core( logger, path )
-    obj = self.new( logger )
+
+  def self.load_file_core( old_logger_do_not_use, path )
+    puts "*** depreciated API call [Pakman::Manifest.load_file_core] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
+
+    obj = self.new
     obj.load_file_core_worker( path )
     obj
   end
-  
-  def self.load_file( logger, path )
-    obj = self.new( logger )
+
+  def self.load_file( old_logger_do_not_use, path )
+    puts "*** depreciated API call [Pakman::Manifest.load_file] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
+
+    obj = self.new
+    obj.load_file_worker( path )
+    obj
+  end
+
+
+  def self.load_file_core_v2( path )
+    obj = self.new
+    obj.load_file_core_worker( path )
+    obj
+  end
+
+  def self.load_file_v2( path )
+    obj = self.new
     obj.load_file_worker( path )
     obj
   end
 
+
+
+
   def each
     @manifest.each { |ary| yield ary }
   end

data/lib/pakman/templater.rb

@@ -2,10 +2,16 @@ module Pakman
 
 class Templater
 
-  attr_reader :logger
-    
-  def initialize( logger )
-    @logger   = logger
+  include LogUtils::Logging
+
+### todo/fix:
+# remove logger from c'tor
+# use logutils instead
+
+  def initialize( old_logger_do_not_use=nil )
+    if old_logger_do_not_use != nil
+         puts "*** depreciated API call [Pakman::Templater.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
+    end
   end
 
 
@@ -17,7 +23,8 @@ class Templater
 
     puts "Merging template pack '#{pakname}'"
 
-    manifest = Manifest.load_file( logger, manifestsrc )
+    # todo: rename to load_file once depreated API got removed
+    manifest = Manifest.load_file_v2( manifestsrc )
 
     manifest.each do |entry|
       dest   = entry[0]

data/lib/pakman/version.rb

@@ -1,3 +1,3 @@
 module Pakman
-  VERSION = '0.4.0'
-end
+  VERSION = '0.5.0'
+end

metadata

@@ -1,77 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pakman
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fetcher
+  requirement: &68820270 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *68820270
+- !ruby/object:Gem::Dependency
+  name: logutils
+  requirement: &68819720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *68819720
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &68819170 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *68819170
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &68818530 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *68818530
 description: pakman - Template Pack Manager
 email: webslideshow@googlegroups.com
-executables: 
+executables:
 - pakman
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
-files: 
+files:
 - History.markdown
 - Manifest.txt
 - README.markdown
@@ -93,39 +84,30 @@ files:
 - lib/pakman/templater.rb
 - lib/pakman/utils.rb
 - lib/pakman/version.rb
-homepage: http://geraldb.github.com/pakman
+homepage: https://github.com/geraldb/pakman
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.markdown
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: pakman
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: pakman - Template Pack Manager
 test_files: []
-