hybook 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b878421b3474bc82e8586c68f84d4c34adaf5e2
-  data.tar.gz: de54ebb90f480d931d0fb35ad258c153bbd5a242
+  metadata.gz: 301a430a30a440fb3217c8011dfa1f7c90352cd4
+  data.tar.gz: 12553f08d6ecb02fb264d47ec90b828cf84921ff
 SHA512:
-  metadata.gz: 1bb70427653c97cdf8713b007dd361dae41fd1263ac7541bbfa4ff7d38765fa0bc7608cee5c356ace22acb2e93ccdf389a0449c235803943ee209102ae14868e
-  data.tar.gz: 05ecd1f22fd8fb07bb1af99e7848fed44a3355f31f3068cb38dbe28d0486dfa42197d4365d30f5344c06d9657782dc113e7b6d0ab05a93b14a106097643d7c51
+  metadata.gz: f44c4eb9cd80d7504e5e0126a24bcef2221f4c0f87f9ae9eb8b98a733df850dde6cc1240699119e0e1280031bad30d1ecdd384bf750a4e18617c51e3de350111
+  data.tar.gz: b530e216c90abfe6e336cb2d890d4c495487e8b8fdc50afdc74f634e352de12377436bcd626228ff52a55193d3274e152555885bbbff7ec0efea4d5ea61a27c4

data/Manifest.txt

@@ -7,11 +7,6 @@ lib/hybook/builder/album.rb
 lib/hybook/builder/book.rb
 lib/hybook/helpers/markdown.rb
 lib/hybook/helpers/misc.rb
-lib/hybook/press/beer.rb
-lib/hybook/press/config.rb
-lib/hybook/press/football.rb
-lib/hybook/press/press.rb
-lib/hybook/press/world.rb
 lib/hybook/std/album.rb
 lib/hybook/type/album.rb
 lib/hybook/type/picture.rb

data/Rakefile

@@ -24,8 +24,6 @@ Hoe.spec 'hybook' do
     ['logutils'],     # logging
     ['textutils'],    # e.g.  >= 0.6 && <= 1.0  ## will include logutils, props
     ['markdown'],  # markdown helper (e.g. link_to etc.)
-    ['bookfile'],   ## used by (book)press
-    ['datafile'],   ## used by (book)press
 
     ## 3rd party
     ['gli'],

data/lib/hybook.rb

@@ -38,19 +38,11 @@ require 'hybook/builder/album'
 
 require 'hybook/writer/jekyll'
 
-## (book)press
-require 'hybook/press/press'
-require 'hybook/press/config'
-require 'hybook/press/world'
-require 'hybook/press/football'
-require 'hybook/press/beer'
-
-
 
 
 
 # say hello
-if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)
+if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG
   puts Hybook.banner
   puts "[hybook] root: #{Hybook.root}"
   puts "[hybook] templates_path: #{Hybook.templates_path}"

data/lib/hybook/version.rb

@@ -2,10 +2,10 @@
 
 
 module Hybook
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 
   def self.banner
-    "hybook #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "hybook/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
   def self.root

data/test/test_basics.rb

@@ -7,7 +7,7 @@ class TestBasics < MiniTest::Test
 
   def test_banner
 
-    banner = "hybook #{Hybook::VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    banner = "hybook/#{Hybook::VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
 
     assert_equal banner, Hybook.banner
     assert_equal banner, HyBook.banner   ## check module alias

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybook
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -66,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bookfile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: datafile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -170,11 +142,6 @@ files:
 - lib/hybook/builder/book.rb
 - lib/hybook/helpers/markdown.rb
 - lib/hybook/helpers/misc.rb
-- lib/hybook/press/beer.rb
-- lib/hybook/press/config.rb
-- lib/hybook/press/football.rb
-- lib/hybook/press/press.rb
-- lib/hybook/press/world.rb
 - lib/hybook/std/album.rb
 - lib/hybook/type/album.rb
 - lib/hybook/type/picture.rb

data/lib/hybook/press/beer.rb

@@ -1,45 +0,0 @@
-# encoding: utf-8
-
-module Hybook
-
-  class BeerConfig < Config
-
-    def initialize( hash ) super; end
-
-    def collection() 'beer'; end
-
-    ############
-    # Bookfile
-    # -- remote
-    def bookfile_url()
-      ## note: for now always return beer.rb
-      ##   use setup/layout-specific bookfiles??   allow selection of package,how?? why,why not??
-      "http://github.com/book-templates/bookfile/raw/master/beer.rb"
-    end
-
-    ########
-    # Datafile
-    # -- remote
-    def datafile_url() "http://github.com/openbeer/datafile/raw/master/#{setup}.rb"; end
-
-    #######
-    # Database
-    def db_path() "#{build_dir}/#{collection}/#{setup}/#{collection}.db"; end
-    def create_db!()  BeerDb.create_all;  end
-
-    ####
-    # Book Templates
-    ## rename to book_dir ?? why, why not? - split zip into book_dir and book_templates_dir why? why not?
-    def book_templates_unzip_dir()  "#{build_dir}/#{collection}/#{setup}/book";  end
-
-  end # class BeerConfig
-
-
-  class BookPress
-    def self.create_beer_book_for( setup, opts={} )
-      config = BeerConfig.new( setup: setup )
-      BookPress.new( config )
-    end
-  end  # class BookPress
-
-end # module Hybook

data/lib/hybook/press/config.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-
-module Hybook
-
-  class Config
-
-    def initialize( hash )
-      @hash = hash
-
-### add source_url  e.g. https://github.com ?? - why, why not???
-
-      @build_dir  = hash[:build_dir] || './build'  ## note: defaults to ./build
-      @setup      = hash[:setup]
-    end
-
-    def build_dir()  @build_dir;   end
-    def setup()      @setup;       end   ## e.g. at, franken, worldcup, etc.
-
-    ######
-    # Datafile
-    # -- local
-    def datafile_dir()  "#{build_dir}/#{collection}/#{setup}";  end
-    def datafile_path() "#{datafile_dir}/Datafile";  end
-
-    ######
-    # Bookfile    -- allow multiple (more than one) bookfiles - how? why, why not???
-    # -- local
-    #
-    # todo: move bookfile_dir to unzip dir (e.g. move Bookfile into /book) - why, why not???
-    def bookfile_dir()  "#{build_dir}/#{collection}/#{setup}";  end
-    def bookfile_path() "#{bookfile_dir}/Bookfile";  end
-  end
-
-end # module Hybook
-

data/lib/hybook/press/football.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-
-module Hybook
-
-  class FootballConfig < Config
-
-    def initialize( hash ) super; end
-
-    def collection() 'football'; end
-
-    ########
-    # Datafile
-    # -- remote
-    def datafile_url() "http://github.com/openfootball/datafile/raw/master/#{setup}.rb"; end
-
-    #######
-    # Database
-    def db_path() "#{build_dir}/#{collection}/#{setup}/#{collection}.db"; end
-
-    def create_db!()
-      SportDb.create_all
-      SportDb.read_builtin   ## note: load built-in datasets (e.g. seasons etc.)
-    end
-
-    ####
-    # Book Templates
-    ## rename to book_dir ?? why, why not? - split zip into book_dir and book_templates_dir why? why not?
-    def book_templates_unzip_dir()  "#{build_dir}/#{collection}/#{setup}/book";  end
-
-  end # class FootballConfig
-
-
-  class BookPress
-    def self.create_football_book_for( setup, opts={} )
-      config = FootballConfig.new( setup: setup )
-      BookPress.new( config )
-    end
-  end  # class BookPress
-
-end # module Hybook

data/lib/hybook/press/press.rb

@@ -1,192 +0,0 @@
-# encoding: utf-8
-
-module Hybook
-
-##
-# todo: change/rename class to Press from BookPress - why, why not??
-
-class BookPress
-
-  def initialize( config )
-    @config = config
-  end
-
-
-  def dl_datasets
-    ## fetch Datafile
-    datafile_dir  = @config.datafile_dir
-    datafile_path = @config.datafile_path
-
-    ## check if folders exists? if not create folder in path
-    FileUtils.mkdir_p( datafile_dir )  unless Dir.exists?( datafile_dir )
-
-    ## note: lets use http:// instead of https:// for now - lets us use person proxy (NOT working w/ https for now)
-    src = @config.datafile_url
-    ## dest will be something like './Datafile'
-
-    fetch_datafile( src, datafile_path )
-
-    datafile = Datafile::Datafile.load_file( datafile_path )
-    datafile.dump        ## for debugging
-    datafile.download    ## datafile step 1 - download all datasets/zips 
-  end
-
-
-  def dl_book_templates
-    ## fetch Bookfile
-    bookfile_dir  = @config.bookfile_dir
-    bookfile_path = @config.bookfile_path
-
-    ## check if folders exists? if not create folder in path
-    FileUtils.mkdir_p( bookfile_dir )  unless Dir.exists?( bookfile_dir )
-
-    ## note: lets use http:// instead of https:// for now - lets us use person proxy (NOT working w/ https for now)
-    src = @config.bookfile_url
-    ## dest will be something like './Bookfile'
-
-    fetch_bookfile( src, bookfile_path )
-
-
-    bookfile = Bookfile::Bookfile.load_file( bookfile_path )
-
-    bookfile.dump        ## for debugging
-    bookfile.download    ## bookfile step 1 - download all packages/zips (defaults to ./tmp) 
-    
-    ## todo/check: already checked in unzip if folder exists???
-    dest_unzip = @config.book_templates_unzip_dir
-    FileUtils.mkdir_p( dest_unzip )  unless Dir.exists?( dest_unzip )
-
-    bookfile.unzip( dest_unzip )   ## bookfile step 2 - unzip book templates 
-  end
-
-
-  def connect
-    db_path = @config.db_path
-
-    db_config = {
-     adapter:  'sqlite3',
-     database: db_path
-    }
-
-    pp db_config
-    ActiveRecord::Base.establish_connection( db_config )
-
-    c = ActiveRecord::Base.connection
-
-    ## try to speed up sqlite
-    ## see http://www.sqlite.org/pragma.html
-    c.execute( 'PRAGMA synchronous=OFF;' )
-    c.execute( 'PRAGMA journal_mode=OFF;' )
-    ## c.execute( 'PRAGMA journal_mode=MEMORY;' )
-    c.execute( 'PRAGMA temp_store=MEMORY;' )
-  end
-
-
-  def build_db
-    ## clean; remove db if exits
-
-    db_path = @config.db_path
-    FileUtils.rm( db_path )  if File.exists?( db_path )
-
-    connect()
-    @config.create_db!
-
-    datafile_path = @config.datafile_path
-    pp datafile_path
-
-
-    ### hack/quick fix for at,de - "standalone quick test": todo
-    ##   - find something better
-    if datafile_path.end_with?( 'at.rb' ) ||
-       datafile_path.end_with?( '/at/Datafile' )
-      ## standalone austria for debugging add country
-      WorldDb::Model::Country.create!( key: 'at',
-                                name: 'Austria',
-                                code: 'AUT',
-                                pop: 0,
-                                area: 0 )
-    elsif datafile_path.end_with?( 'de.rb' ) ||
-          datafile_path.end_with?( '/de/Datafile' )
-      WorldDb::Model::Country.create!( key: 'de',
-                                name: 'Germany',
-                                code: 'GER',
-                                pop: 0,
-                                area: 0 )
-    else
-      # no special case; continue
-      puts "[debug] - no special world archive case w/ start script; continue"
-    end
-
-
-    datafile = Datafile::Datafile.load_file( datafile_path )
-    datafile.dump    ## for debugging
-
-    logger = LogUtils::Logger.root
-    logger.level = :debug
-
-    datafile.read    ## datafile step 2 - read all datasets 
-  end
-
-
-  def build_book
-    connect()
-
-    bookfile_path = @config.bookfile_path
-
-    bookfile = Bookfile::Bookfile.load_file( bookfile_path )
-    bookfile.dump        ## for debugging
-
-    ### fix:
-    ###     assume WorldDb::Models already included ??
-    ## - for now always include on prepare
-    bookfile.prepare( @config.book_templates_unzip_dir )
-
-    puts "  contintents: #{WorldDb::Model::Continent.count}"   ## for debugging
-
-    bookfile.build( @config.book_templates_unzip_dir )
-
-    puts 'Done.'
-  end
-
-
-  def run_jekyll
-    # change cwd folder
-    cwd = FileUtils.pwd
-    puts "cwd (before): #{cwd}"
-    FileUtils.cd( @config.book_templates_unzip_dir )
-    puts "cwd (after): #{cwd}"
-
-    ## use `cd #{book_dir}; jekyll build`  -- why, why not???
-    puts `jekyll build`
-
-    # restore cwd folder
-    FileUtils.cd( cwd )
-  end
-
-
-  def build
-    ## all-in-one; do everything; complete all steps
-    dl_datasets
-    dl_book_templates
-
-    build_db
-    build_book
-    run_jekyll
-  end
-
-
-private
-
-  def fetch_datafile( src, dest )
-    worker = Fetcher::Worker.new
-    worker.copy( src, dest )
-  end
-
-  def fetch_bookfile( src, dest )
-    worker = Fetcher::Worker.new
-    worker.copy( src, dest )
-  end
-
-end  # class BookPress
-
-end # module Hybook

data/lib/hybook/press/world.rb

@@ -1,45 +0,0 @@
-# encoding: utf-8
-
-module Hybook
-
-  class WorldConfig < Config
-
-    def initialize( hash ) super; end
-
-    def collection() 'world'; end
-
-    ############
-    # Bookfile
-    # -- remote
-    def bookfile_url()
-      ## note: for now always return world.rb
-      ##   use country specific bookfiles ??   allow selection of package,how?? why,why not??
-      "https://github.com/book-templates/bookfile/raw/master/world.rb"
-    end
-
-    ########
-    # Datafile
-    # -- remote
-    def datafile_url() "https://github.com/openmundi/datafile/raw/master/#{setup}.rb"; end
-
-    #######
-    # Database
-    def db_path() "#{build_dir}/#{collection}/#{setup}/#{collection}.db"; end
-    def create_db!()  WorldDb.create_all;  end
-
-
-    ######################
-    ## rename to book_dir ?? why, why not? - split zip into book_dir and book_templates_dir why? why not?
-    def book_templates_unzip_dir()  "#{build_dir}/#{collection}/#{setup}/book";  end
-
-  end # class WorldConfig
-
-
-  class BookPress
-    def self.create_world_book_for( setup, opts={} )
-      config = WorldConfig.new( setup: setup )
-      BookPress.new( config )
-    end
-  end  # class BookPress
-
-end # module Hybook