mrhyde-tools 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aae57c42c231ddd4cbf85848a18d5f43c98ece4f
-  data.tar.gz: b90daa336b9b14f682fbbaed03b5199d14ac8ade
+  metadata.gz: 2f12cb63c722e3cff55bf0744d02bd0eb071cb53
+  data.tar.gz: 7261bfea0eb19519ffb257a1497b4de74103cb0b
 SHA512:
-  metadata.gz: 80d28406f03ea41d492fb025a98eb1490a8fe665f4d0c3e88f2adbf99880b55074f1e2eb6770b308b798153d9d89cdf260594eb1424440581944963de05363b6
-  data.tar.gz: b170832289088da0ad4af8176ce6c589a645fbefc27e40e536536b7c2cb09ea245e40c73039f1d9d62b03d9b6dfd02cdcd610215df373f09b9a7e2f502d5b130
+  metadata.gz: a4294554f67b38375e1b18b9d52df49a4da0834e73596997de1a3dfa0d2eabb56b6a96cccb4f1a0aecd169c6a8e39dd92249c8af9463f9da4699f3e6317c9d7e
+  data.tar.gz: 72ebbcb37e690c72e34bc7419cad942db7ee46547d1e38078cd1588b602d55aeb5d57fdc189aec0de679d777b8ad0280a361fa9d6482c7a57f4da5f0c11477c9

data/Manifest.txt

@@ -8,15 +8,11 @@ lib/mrhyde.rb
 lib/mrhyde/builder.rb
 lib/mrhyde/cli/main.rb
 lib/mrhyde/cli/opts.rb
-lib/mrhyde/config.rb
 lib/mrhyde/tools.rb
 lib/mrhyde/version.rb
-lib/mrhyde/wizard.rb
 test/helper.rb
 test/scripts/starter.rb
 test/scripts/starterii.rb
 test/test_builder.rb
-test/test_config.rb
 test/test_install_theme.rb
 test/test_url.rb
-test/test_wizard.rb

data/Rakefile

@@ -20,7 +20,8 @@ Hoe.spec 'mrhyde-tools' do
   self.extra_deps = [
     ['logutils'],
     ['textutils'],
-    ['drjekyll'],
+    ['drjekyll', '>= 0.1.1'],
+    ['quik',     '>= 0.3'],    
   ]
 
   self.licenses = ['Public Domain']

data/lib/mrhyde.rb

@@ -8,13 +8,12 @@ require 'uri'
 
 ## 3rd party libs
 require 'textutils'      ## used for File.read_utf8
-require 'drjekyll'     
+require 'drjekyll'
+require 'quik'           ## used for wizards, (open)config etc. 
 
 ## our own code
 require 'mrhyde/version'    # note: let version always go first
-require 'mrhyde/wizard'
 require 'mrhyde/builder'
-require 'mrhyde/config'
 
 require 'mrhyde/cli/opts'
 require 'mrhyde/cli/main'

data/lib/mrhyde/builder.rb

@@ -16,7 +16,7 @@ class Builder
   end
 
 
-  include Wizard   ## mixin helpers for say, ask, yes?, no?, select, etc.
+  include Quik::Wizard   ## mixin helpers for say, ask, yes?, no?, select, etc.
 
   def initialize( opts={} )
     puts "starting new MrHyde script (sitefile) #{opts.inspect}; lets go"
@@ -39,7 +39,8 @@ class Builder
 
     ## themes_dir = "#{DrJekyll.root}/test/data"
     ## catalog = Catalog.new( "#{themes_dir}/themes.yml" )
-    url = "https://github.com/drjekyllthemes/themes/raw/master/o/themes.yml"
+    url = "https://github.com/drjekyllthemes/themes/raw/master/themes.yml"
+    puts "GET #{url}"    ##  todo - add color e.g. .bold.green
 
     if test?
       # do nothing; dry run
@@ -48,6 +49,9 @@ class Builder
       theme = catalog.find( key )
       if theme
         pak = DrJekyll::Package.new( key, theme )
+
+        ## todo/fix:
+        ##   add GET URL   w/ color e.g. bright/bold green
         pak.download
         pak.unzip( "#{@output_dir}/#{key}" )
       else
@@ -60,7 +64,7 @@ class Builder
 
   def config( opts={} )
     puts "  handle config block"
-    c = OpenConfig.new
+    c = Quik::OpenConfig.new
     yield( c )
     ## pp c
     h = c.to_h

data/lib/mrhyde/cli/main.rb

@@ -57,6 +57,9 @@ def self.fetch_script( name )
     text = File.read_utf8( local_script )
   else  ## fetch remote script
     url = "https://github.com/mrhydescripts/scripts/raw/master/#{name}.rb"
+
+    puts "GET #{url}"    ##  todo - add color e.g. .bold.green
+    
     ## assume utf8 text encoding for now
     worker = Fetcher::Worker.new
     text = worker.read_utf8!( url )

data/lib/mrhyde/version.rb

@@ -5,7 +5,7 @@ module MrHyde
 
   MAJOR = 0
   MINOR = 1
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_builder.rb

@@ -12,7 +12,7 @@ class TestBuilder < MiniTest::Test
 
   def test_starter
 
-    $MRHYDE_WIZARD_IN = EchoIO.new( <<EOS )
+    $QUIK_WIZARD_IN = EchoIO.new( <<EOS )
 Another Beautiful Static Site
 H. J.
 EOS
@@ -24,7 +24,7 @@ EOS
 
   def test_starterii
 
-    $MRHYDE_WIZARD_IN = EchoIO.new( <<EOS )
+    $QUIK_WIZARD_IN = EchoIO.new( <<EOS )
 Another Beautiful Static Site
 http://example.github.io/repo
 H. J.

data/test/test_install_theme.rb

@@ -12,7 +12,7 @@ class TestInstallTheme < MiniTest::Test
 
   def test_starter
 
-    $MRHYDE_WIZARD_IN = EchoIO.new( <<EOS )
+    $QUIK_WIZARD_IN = EchoIO.new( <<EOS )
 Another Beautiful Static Site
 H. J.
 EOS

data/test/test_url.rb

@@ -8,6 +8,11 @@
 require 'helper'
 
 
+#######
+##
+##  fix/todo:
+##     move to quik gem and test dir!!!!!!!!!!
+
 class TestUrl < MiniTest::Test
 
   def test_clean_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrhyde-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: quik
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -103,18 +117,14 @@ files:
 - lib/mrhyde/builder.rb
 - lib/mrhyde/cli/main.rb
 - lib/mrhyde/cli/opts.rb
-- lib/mrhyde/config.rb
 - lib/mrhyde/tools.rb
 - lib/mrhyde/version.rb
-- lib/mrhyde/wizard.rb
 - test/helper.rb
 - test/scripts/starter.rb
 - test/scripts/starterii.rb
 - test/test_builder.rb
-- test/test_config.rb
 - test/test_install_theme.rb
 - test/test_url.rb
-- test/test_wizard.rb
 homepage: https://github.com/mrhydescripts/mrhyde
 licenses:
 - Public Domain
@@ -137,13 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: mrhyde - jekyll command line tool .:. static site quick starter script wizard
-test_files:
-- test/test_wizard.rb
-- test/test_install_theme.rb
-- test/test_builder.rb
-- test/test_config.rb
-- test/test_url.rb
+test_files: []

data/lib/mrhyde/config.rb

@@ -1,60 +0,0 @@
-#encoding: utf-8
-
-module MrHyde
-
-##
-# used for config block
-#   lets you access props (even nested) that don't yet exist
-#    and all props get stored in a hash
-#
-#  e.g
-#  c = OpenConfig.new
-#  c.title        = 'title'
-#  c.author.name  = 'name'
-
-#  c.mrhyde.last_updated = Time.now
-#  c.mrhyde.title        = 'title'
-#  c.mrhyde.name         = 'name'
-#  c.mrhyde.theme        = 'theme'
-
-class OpenConfig
-
-  def initialize
-    @h = {}
-  end
-
-  def to_h
-    h = {}
-    @h.each do |k,v|
-      if v.is_a? OpenConfig
-        h[ k ] = v.to_h
-      else
-        h[ k ] = v  ## just pass along as is
-      end
-    end
-    h
-  end
-
-  def method_missing( m, *args, &block)
-    if m.to_s =~ /^(.*)=$/   ## setter
-      puts "config lookup (setter) >#{m}< #{m.class.name}, #{args.inspect}"
-      key = m[0..-2].to_s  ## cut off trailing =
-      @h[ key ] = args[0].to_s    # note: assume first arg is value for setter
-                                # note: for now all values are strings (always use to_s)
-    else       ## assume getter
-      ## fix: add check for args??  must be 0 for getters??
-      ##       use else super to delegate non-getters??
-      puts "config lookup (getter) >#{m}< #{m.class.name}"
-      key = m.to_s
-      value = @h[ key ]
-      if value.nil?
-        puts "  config add (nested) hash"
-        value = @h[ key ] = OpenConfig.new
-      end
-      value
-    end  
-  end # method_missing
-
-end # class OpenConfig
-   
-end  # module MrHyde

data/lib/mrhyde/wizard.rb

@@ -1,88 +0,0 @@
-# encoding: utf-8
-
-
-## note:
-##  use global $MRHYDE_WIZARD_STDIN
-##    lets you redirect stdin for testing  e.g $MRHYDE_WIZARD_STDIN = StringIO.new( 'test/n' )
-$MRHYDE_WIZARD_IN = $stdin
-
-
-module MrHyde
-
-module Wizard   ## use a different name e.g. WizardHelpers, FormHelpers, InputHelper, etc - why, why not??
-
-def getstr  ## use getstr to avoid conflict w/ gets (use better name? read_string, readline (already exists too), etc.?)
-  ## note: gets will include trailing newline (user hits return to enter data)
-  ##   - use strip for now (remove leading and traling whitspaces) - might later just use chomp ? (jsut removes newlines)
-  $MRHYDE_WIZARD_IN.gets.strip
-end
-
-def say( text )
-  puts text
-end
-
-
-YES_REGEX = /y|yes|on|t|true/i      ## support YAML true values - double check (YAML does NOT support t/f)
-NO_REGEX  = /n|no|off|f|false/i
-
-def yes?( question )   ## defaults to yes - why, why not??
-  ## todo: strip trailing question mark (?) if present (gets auto-included)
-  print( "Q: #{question} (y/n)? [y]: " )
-  str = getstr
-  if str.empty? || str =~ YES_REGEX
-    true
-  elsif str =~ NO_REGEX
-    false
-  else    ## warn: unknown value??
-    true
-  end
-end
-
-def no?( question )   ## defaults to yes - why, why not??
-  ## todo: strip trailing question mark (?) if present (gets auto-included)
-  print( "Q: #{question} (y/n)? [n]: " )
-  str = getstr
-  if str.empty? || str =~ NO_REGEX
-    true
-  elsif str =~ YES_REGEX
-    false
-  else    ## warn: unknown value??
-    true
-  end
-end
-
-
-def ask( question, default=nil )
-  ## todo: strip trailing question mark (?) if present (gets auto-included)
-  if default
-    print( "Q: #{question}? [#{default}]: " )
-  else
-    print( "Q: #{question}?: " )
-  end
-
-  str = getstr
-  if default && str.empty?   ## todo: best way to check for empty string?
-    str = default
-  end
-  str  
-end
-
-
-def select( title, options )
-  puts( "Q: #{title}: " )
-  options.each_with_index do |opt,i|
-    puts "    #{i+1} - #{opt}"
-  end
-  print( "   Your choice (1-#{options.size})? [1]: " )
-  str = getstr
-  if str.empty?   ## todo: best way to check for empty string?
-    num = 0   ## default to first option for now
-  else
-    num = str.to_i   ## note: defaults to 0 if cannot convert?
-    num -= 1   if num > 0    ## note: "convert" from 1-based to 0-based for ary; if invalid entry; default to 0
-  end
-  options[ num ]
-end
-
-end # module Wizard
-end # module MrHyde

data/test/test_config.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-
-###
-# to run use
-#   ruby -I ./lib -I ./test test/test_config.rb
-
-
-require 'helper'
-
-
-class TestConfig < MiniTest::Test
-
-  def test_config
-
-    c = MrHyde::OpenConfig.new
-    c.title        = 'title'
-    c.author.name  = 'name'
-
-    c.mrhyde.last_updated = Time.now
-    c.mrhyde.title        = 'title'
-    c.mrhyde.name         = 'name'
-    c.mrhyde.theme        = 'theme'
-    c.mrhyde.meta.info    = 'test nested nested value'
-
-    pp c.to_h
-
-    assert true  ## if we get here; everything is ok
-  end
-
-
-end # class TestConfig

data/test/test_wizard.rb

@@ -1,50 +0,0 @@
-# encoding: utf-8
-
-###
-# to run use
-#   ruby -I ./lib -I ./test test/test_wizard.rb
-
-
-require 'helper'
-
-
-class TestWizard < MiniTest::Test
-
-  include MrHyde::Wizard   ## lets you use ask etc.
-
-  def test_ask
-
-    $MRHYDE_WIZARD_IN = EchoIO.new( <<EOS )
-Another Beautiful Static Site
-
-H. J.
-
-2
-n
-y
-EOS
-
-    say "Hello, Wizard!"
-
-    title = ask "What's your site's title", "Your Site Title"
-    assert_equal 'Another Beautiful Static Site', title
-
-    title = ask "What's your site's title", "Your Site Title"
-    assert_equal 'Your Site Title', title
-
-    name = ask "Your Name"
-    assert_equal 'H. J.', name
-
-    theme = select "Select your theme", ["Starter", "Bootstrap", "Minimal"]
-    assert_equal 'Starter', theme
-
-    theme = select "Select your theme", ["Starter", "Bootstrap", "Minimal"]
-    assert_equal 'Bootstrap', theme
-
-    assert_equal false, yes?( "Add to GitHub" )
-    assert_equal false, no?( "Add to GitHub" )
-
-    assert true  ## if we get here; everything is ok
-  end
-
-end # class TestWizard