bookfile 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c81694a303dcd835d8789dce463ec4a639e6d512
-  data.tar.gz: dbefc7253f83fbfcfecaad2a8b1c200e1151e001
+  metadata.gz: b57f3bd63c77b842f19479c0eb1827009595fb40
+  data.tar.gz: bd04e02d0a9155dba182c274d084539bccbafa9c
 SHA512:
-  metadata.gz: f3ae2203cec27d8afc9c768d1fba699771e98f50ed87b08b36b15e627b8d72bcc96d60f9f02187ad5e104907c7b0bc1175b1b3ca52c9bf6fe9829ed8d30b91c4
-  data.tar.gz: 80f11909f3b6de0848bfbd42779c453ac6334bbae57cbb67314e2bcd65d88e0dd9909469543a7cb5fc437733741ce933af7a52fef9c729e33a4f489c2df26402
+  metadata.gz: 47352f6d93dc15529d52e3eef9bc1ba552146dd33d3430fe328d3c4b016f1fd5b92142d23641974ccb82ecac2d70ca7acdac11cdb68d97e6254fd154c12582bc
+  data.tar.gz: ed82ef48aaba72732ddf9f4edaadde94df67b8aa420f2ea004d5e1822bae85c6a7baca930f0c3aa8d3b808bbe6cd0f41ffbf19c184fbe5d8c33c8eeaebaf0f7a

data/Manifest.txt

@@ -8,14 +8,13 @@ lib/bookfile/book/config.rb
 lib/bookfile/bookfile.rb
 lib/bookfile/builder.rb
 lib/bookfile/database/database.rb
-lib/bookfile/helpers/markdown.rb
-lib/bookfile/helpers/misc.rb
 lib/bookfile/package/package.rb
 lib/bookfile/version.rb
 test/bookfile/beer.rb
 test/bookfile/football.rb
 test/bookfile/world.rb
 test/helper.rb
+test/test_basics.rb
 test/test_beer.rb
 test/test_football.rb
 test/test_world.rb

data/Rakefile

@@ -23,9 +23,9 @@ Hoe.spec 'bookfile' do
     ['props'],         # settings / prop(ertie)s / env / INI
     ['logutils'],     # logging
     ['textutils'],    # e.g.  >= 0.6 && <= 1.0  ## will include logutils, props
-    ['rubyzip'],   ## todo: check if included in ??
     ['fetcher'],   ## todo: check if included in ??
-    ['hybook']     ## todo: check if included in ??
+    ['rubyzip'],   ## todo: check if included in ??
+    ### ['hybook']     ## avoid circular dependency - do NOT include
   ]
 
   self.spec_extras = {

data/lib/bookfile/book/book.rb

@@ -9,6 +9,11 @@
 ##    opts[:inline] == true  ???? - why, why not???
 
 
+module HybookHelper
+   ## note: "quickfix" - find a better way to forward declare (lives in hybook)???
+end
+
+
 module Bookfile
 
 

data/lib/bookfile/version.rb

@@ -1,10 +1,17 @@
 # encoding: utf-8
 
 module Bookfile
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
+
+  def self.banner
+    "bookfile/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  end
+
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+  end
 end
 
 ## add module alias
-
 BookFile = Bookfile
 

data/lib/bookfile.rb

@@ -6,29 +6,34 @@
 require 'pp'
 require 'ostruct'
 
+
 ##############
 # 3rd party gems
 
-require 'logutils'     # uses Logging etc.
-require 'textutils'    # uses File.read_utf8
+
+#########################################
+# "standalone" version - pull in hybook
+#  - todo/check - possible to use bookfile w/o hybook?? why, why not??
+
+=begin
+unless defined?(Hybook)
+  require 'logutils'    # uses Logging etc.    -- todo: get required by hybook - remove??
+  require 'textutils'   # uses File.read_utf8   -- todo: get required by hybook - remove??
+  require 'hybook'      # todo/fix: check if hybook required/needed for now??
+end
+=end
+## else assumes hybook gem aready required (avoid circular require)
 
 
 require 'fetcher'
 require 'zip'        # use $ gem install rubyzip
-require 'hybook'     # todo/fix: check if hybook required/needed for now??
+
 
 ####################
 # our own code
 
 require 'bookfile/version'  # let it always go first
 
-###
-# helpers
-# todo/fix: move helpers to hybook
-require 'bookfile/helpers/markdown'   ## module HybookHelper
-require 'bookfile/helpers/misc'       ## module HybookHelper
-
-
 require 'bookfile/database/database'
 require 'bookfile/package/package'
 require 'bookfile/book/config'
@@ -36,3 +41,7 @@ require 'bookfile/book/book'
 require 'bookfile/bookfile'
 require 'bookfile/builder'
 
+
+
+# say hello
+puts Bookfile.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)

data/test/helper.rb

@@ -4,6 +4,10 @@
 require 'minitest/autorun'
 
 
+require 'textutils'
+
 ## our own code
 require 'bookfile'
 
+## more 3rd party/lib code
+## require 'hybook'

data/test/test_basics.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_basics.rb
+
+require 'helper'
+
+class TestBasics < MiniTest::Test
+
+  def test_banner
+
+    banner = "bookfile/#{Bookfile::VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+
+    assert_equal banner, Bookfile.banner
+    assert_equal banner, BookFile.banner   ## check module alias
+
+  end
+
+end # class Basics

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookfile
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  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: fetcher
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hybook
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,14 +128,13 @@ files:
 - lib/bookfile/bookfile.rb
 - lib/bookfile/builder.rb
 - lib/bookfile/database/database.rb
-- lib/bookfile/helpers/markdown.rb
-- lib/bookfile/helpers/misc.rb
 - lib/bookfile/package/package.rb
 - lib/bookfile/version.rb
 - test/bookfile/beer.rb
 - test/bookfile/football.rb
 - test/bookfile/world.rb
 - test/helper.rb
+- test/test_basics.rb
 - test/test_beer.rb
 - test/test_football.rb
 - test/test_world.rb
@@ -184,4 +169,5 @@ test_files:
 - test/test_football.rb
 - test/test_beer.rb
 - test/test_world.rb
+- test/test_basics.rb
 - test/test_world_templates.rb

data/lib/bookfile/helpers/markdown.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-
-module HybookHelper
-
-###########################
-# markdown helpers
-
-###
-#  fix: move to Markdown gem
-#   add to new module
-#  MarkdownHelper or Markdown::Helper ???
-
-
-def link_to( title, link )
-  "[#{title}](#{link})"
-end
-
-
-def columns_begin( opts={} )
-  # note: will add  columns2 or columns3 etc. depending on columns option passed in
-
-  ## note: default was 2 (columns) for world.db, 300 (px) for beer.db
-  columns = opts[:columns] || 300
-
-  "\n<div class='columns#{columns}' markdown='1'>\n\n"
-end
-
-def columns_end
-  "\n</div>\n\n"
-end
-
-### todo: check if we can use columns simply w/ yield for body ??
-
-
-end # module HybookHelper

data/lib/bookfile/helpers/misc.rb

@@ -1,13 +0,0 @@
-# encoding: utf-8
-
-module HybookHelper
-
-### todo:
-##  add to textutils ?? why? why not??
-def number_with_delimiter( num )
-  delimiter = '.'
-  num.to_s.reverse.gsub( /(\d{3})(?=\d)/, "\\1#{delimiter}").reverse
-end
-
-
-end # module HybookHelper