sportdb 0.4.3 → 0.4.4

data/lib/sportdb/reader.rb

@@ -7,25 +7,60 @@ class Reader
   include SportDB::Models
 
 
-  def initialize( opts )
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
+  def initialize( logger=nil )
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
+  end
+
+  attr_reader :logger
+
+  def run( opts, args )
+ 
+    args.each do |arg|
+      name = arg     # File.basename( arg, '.*' )
+
+      if opts.load?
+        load_fixtures_builtin( opts.event, name )
+      else
+        load_fixtures_with_include_path( opts.event, name, opts.data_path )
+      end
+    end
+
+  end
+
+
+  def load_fixtures_with_include_path( event_key, name, include_path )  # load from file system
+    path = "#{include_path}/#{name}.txt"
+
+    puts "*** parsing data '#{name}' (#{path})..."
+
+    code = File.read( path )
     
-    @opts = opts
+    load_fixtures_worker( event_key, code )
   end
 
-  attr_reader :logger, :opts
+  def load_fixtures_builtin( event_key, name ) # load from gem (built-in)
+    path = "#{SportDB.root}/db/#{name}.txt"
 
-  def run( args )
-  
-    puts SportDB.banner
+    puts "*** parsing data '#{name}' (#{path})..."
 
-    puts "working directory: #{Dir.pwd}"
- 
+    code = File.read( path )
+    
+    load_fixtures_worker( event_key, code )
+  end
+
+
+private
+  def load_fixtures_worker( event_key, data )
+   
     ## assume active activerecord connection
     ##
     
-    @event = Event.find_by_key!( opts.event )
+    @event = Event.find_by_key!( event_key )
     
     puts "Event #{@event.key} >#{@event.title}<"
 
@@ -58,17 +93,10 @@ class Reader
       
       puts "  Team[#{index+1}] #{team.key} >#{titles.join('|')}<"
     end
- 
- 
-    args.each do |arg|
-      name = arg     # File.basename( arg, '.*' )
-      parse_fixtures( name )
-    end
-    
-    
-    puts 'Done.'
+  
+    parse_fixtures( data )
     
-  end   # method run
+  end   # method load_fixtures
 
 
   def is_round?( line )
@@ -249,15 +277,9 @@ class Reader
   end # method translate_teams!
   
 
-  def parse_fixtures( name )
-  
-    path = "#{opts.data_path}/#{name}.txt"
- 
-    puts "*** parsing data '#{name}' (#{path})..."
-
-    old_lines = File.read( path )
-    
-    old_lines.each_line do |line|
+  def parse_fixtures( data )
+      
+    data.each_line do |line|
   
       if line =~ /^\s*#/
         # skip komments and do NOT copy to result (keep comments secret!)
@@ -403,4 +425,4 @@ class Reader
 
   
 end # class Reader
-end # module SportDB
+end # module SportDB

data/lib/sportdb/templater.rb

@@ -27,45 +27,39 @@ class Templater
   include SportDB::Models
 
 
-  def initialize( opts )
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
-    
-    @opts = opts
+  def initialize( logger )
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
   end
 
-  attr_reader :logger, :opts
-
-  # make props available for template
-  attr_reader :event   
-  
-  def run( args )
-  
-    puts SportDB.banner
+  attr_reader :logger
 
-    puts "working directory: #{Dir.pwd}"
- 
+  def run( opts, args )
+   
     ## assume active activerecord connection
     ##
-    
-    @event = Event.find_by_key!( opts.event )
-    
-    puts "Event #{@event.key} >#{@event.title}<"
-
- 
+     
     args.each do |arg|
       ## name = File.basename( arg, '.*' )
       name = arg
-      gen_fixtures( name )
+      gen_fixtures( opts.event, name )
     end
-    
-    
-    puts 'Done.'
-    
+
   end   # method run
 
+
+  # make props available for template
+  attr_reader :event
   
-  def gen_fixtures( name )
+  def gen_fixtures( event_key, name )
+
+    @event = Event.find_by_key!( event_key )
+    
+    puts "Event #{@event.key} >#{@event.title}<"
 
     ## todo: honor -o/--output option ??
 

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/lib/sportdb.rb

@@ -56,10 +56,23 @@ module SportDB
   # load built-in (that is, bundled within the gem) named seeds
   # - pass in an array of seed names e.g. [ 'cl/teams', 'cl/2012_13/cl' ] etc.
 
-  def self.load( args )
-    Loader.new.run( args )
+  def self.load( ary )
+    loader = Loader.new
+    ary.each do |name|
+      loader.load_fixtures_builtin( name )
+    end
   end
-  
+
+  # load built-in (that is, bundled within the gem) named plain text seeds
+  # - pass in an array of pairs of event/seed names e.g. [['at.2012/13', 'at/2012_13/bl'], ['cl.2012/13', 'cl/2012_13/cl']] etc.
+
+  def self.read( ary )
+    reader = Reader.new
+    ary.each do |rec|
+      reader.load_fixtures_builtin( rec[0], rec[1] ) # event_key, name 
+    end
+  end
+
   
   class Deleter
     ## todo: move into its own file???    

data/templates/fixtures.rb.erb

@@ -27,7 +27,15 @@ ev = Event.find_by_key!( '<%= event.key %>' )
 <% event.rounds.each do |round| %>
 <%= 'games%02d' % round.pos %> = [
 <% round.games.each_with_index do |game| %>
- [ <%= '%-18s' % "#{game.team1.key}," %> [<%= "#{game.score1},#{game.score2}" if game.score1.present? && game.score2.present? %>], <%= '%-18s' % "#{game.team2.key}," %> Time.utc('<%= game.play_at.strftime('%Y-%m-%d %H:%M') %>') ], 
+ [ <%= '%3d' % game.pos %>, <%= '%-18s' % "#{game.team1.key}," %>
+   [
+     <%= "#{game.score1},#{game.score2}" if game.score1.present? && game.score2.present? %>
+     <%= ",#{game.score3},#{game.score4}" if game.score3.present? && game.score4.present? %>
+     <%= ",#{game.score5},#{game.score6}" if game.score5.present? && game.score6.present? %>   
+   ],
+   <%= '%-18s' % "#{game.team2.key}," %> Time.utc('<%= game.play_at.strftime('%Y-%m-%d %H:%M') %>')
+   , <%= game.knockout %>
+ ], 
 <%# does comma for last entry matter? ruby ignores it for sure? check %>
 <% end %>
 ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-28 00:00:00 Z
+date: 2012-10-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -70,9 +70,13 @@ extensions: []
 
 extra_rdoc_files: 
 - Manifest.txt
+- db/at/2011_12/bl.txt
 - db/at/2012_13/bl.txt
+- db/at/2012_13/cup.txt
 - db/de/2012_13/bl.txt
 - db/en/2012_13/pl.txt
+- db/world/quali_2012_13_c.txt
+- db/world/quali_2012_13_i.txt
 files: 
 - History.markdown
 - Manifest.txt
@@ -80,10 +84,15 @@ files:
 - Rakefile
 - bin/sportdb
 - db/at/2011_12/bl.rb
+- db/at/2011_12/bl.txt
+- db/at/2011_12/bl_fixtures.rb
 - db/at/2011_12/cup.rb
 - db/at/2012_13/bl.rb
 - db/at/2012_13/bl.txt
+- db/at/2012_13/bl_fixtures.rb
 - db/at/2012_13/cup.rb
+- db/at/2012_13/cup.txt
+- db/at/2012_13/cup_fixtures.rb
 - db/at/teams.rb
 - db/cl/2011_12/cl.rb
 - db/cl/2011_12/el.rb
@@ -108,7 +117,10 @@ files:
 - db/ro/teams.rb
 - db/world/quali_2012_13.rb
 - db/world/quali_2012_13_c.rb
+- db/world/quali_2012_13_c.txt
+- db/world/quali_2012_13_fixtures.rb
 - db/world/quali_2012_13_i.rb
+- db/world/quali_2012_13_i.txt
 - lib/sportdb.rb
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/cli/runner.rb