gumdrop 1.0.0 → 1.0.1

data/.gitignore

@@ -4,4 +4,4 @@ output
 .sass-cache
 *.log
 old_*
-**/Gemfile.lock
+Gemfile.lock

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# v1.0.1
+- Moved `watch` feature from gem CLI to example in Gumdrop site file. (Because the listen gem does not, in fact, work on every platform out of the box -- At least, not in a way that's usable in a library like this -- Gumdrop needs to support Windows, so listen is gone from core.)
+- Fixed local reference to gumdrop gem in the default tempalte Gemfile.
+
 # v1.0.0
 - Complete internel rearchitecture. Good stuff.
 - Gumdrop files are now straight ruby that's loaded by gumdrop. You can do any typical ruby kind of things are the root level without having any scope surprises (Gumdrop will have been loaded).

data/Readme.md

@@ -77,7 +77,7 @@ open source projects (in alphabetical order):
 
 * ActiveSupport
 * Bundle
-* Listen
+* Launchy
 * Onfire
 * Sinatra
 * Tilt
@@ -89,5 +89,8 @@ And will, optionally, leverage these in building your site:
 * sprockets
 * stitch
 * jsmin
+* slim
+* haml/sass
+* coffee-script
 * and many, many more! (todo: gotta document 'em all!)
 

data/gumdrop.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
    s.add_dependency 'active_support'
    s.add_dependency 'onfire'
    s.add_dependency 'sinatra'
-   s.add_dependency 'listen'
    s.add_dependency 'i18n'
    s.add_dependency 'bundle'
 

data/lib/gumdrop/cli/internal.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'listen'
 require 'thor'
 
 module Gumdrop::CLI
@@ -27,23 +26,10 @@ module Gumdrop::CLI
 
     desc 'server', 'Run development server'
     def server
-      Gumdrop.site.options = options.merge(mode:'build')
+      Gumdrop.site.options = options.merge(mode:'server')
       Gumdrop::Server
     end
 
-    desc 'watch', "Watch filesystem for changes and recompile"
-    method_option :quiet, default:false, aliases:'-q', type: :boolean
-    method_option :subdued, default:false, aliases:'-s', type: :boolean, desc:"Subdued output (....)"
-    method_option :resume, default:false, aliases:'-r', type: :boolean, desc:"Auto resume rendering after any errors"
-    def watch
-      Gumdrop.run options.merge(mode:'merge')
-      paths= [Gumdrop.site.source_dir, Gumdrop.site.sitefile] #? Sitefile too?
-      paths << Gumdrop.site.data_dir if File.directory? Gumdrop.site.data_dir
-      Listen.to(*paths, :latency => 0.5) do |m, a, r|
-        Gumdrop.rebuild options.merge(mode:'merge')
-      end
-    end
-
     desc 'template [NAME]', "Create local template from this project"
     def template(name)
       template= name
@@ -89,7 +75,6 @@ module Gumdrop::CLI
       say "Gumdrop v#{ Gumdrop::VERSION }"
     end
 
-
   private
     
     def home_path(name="")

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION= "1.0.0"
+  VERSION= "1.0.1"
 
 end

data/templates/blank/Gumdrop

@@ -198,6 +198,27 @@ end
 #     end
 #   end
 
+  # desc 'watch', "Watches the filesystem and recompiles whenever a source file changes."
+  # method_option :quiet, default:false, aliases:'-q', type: :boolean
+  # def watch
+  #   require 'listen'
+  #   if options[:quiet]
+  #     Gumdrop.configure {|c| c.log_level= :warn }
+  #   end
+  #   Gumdrop.run
+  #   paths= [Gumdrop.site.source_dir] #? Sitefile too?
+  #   paths << Gumdrop.site.data_dir if File.directory? Gumdrop.site.data_dir
+  #   Listen.to(*paths, :latency => 0.5) do |m, a, r|
+  #     Gumdrop.log.info "Reloading site!"
+  #     Gumdrop.rebuild
+  #   end
+  # rescue LoadError
+  #   say "Error: Watch requires the listen gem, be sure and add it to your Gemfile!"
+  # rescue => ex
+  #   say "Error: #{ ex }"
+  # end
+
+
 # end
 
 

data/templates/default/Gemfile

@@ -1,6 +1,9 @@
 source "http://rubygems.org"
 
-gem "gumdrop", :path=>'../../'
+gem "gumdrop"
+
+# for the watch command
+# gem "listen"
 
 # Add your dependencies here:
 

data/templates/default/Gumdrop

@@ -197,6 +197,26 @@ Gumdrop.cli do
     end
   end
 
+  desc 'watch', "Watches the filesystem and recompiles whenever a source file changes."
+  method_option :quiet, default:false, aliases:'-q', type: :boolean
+  def watch
+    require 'listen'
+    if options[:quiet]
+      Gumdrop.configure {|c| c.log_level= :warn }
+    end
+    Gumdrop.run
+    paths= [Gumdrop.site.source_dir] #? Sitefile too?
+    paths << Gumdrop.site.data_dir if File.directory? Gumdrop.site.data_dir
+    Listen.to(*paths, :latency => 0.5) do |m, a, r|
+      Gumdrop.log.info "Reloading site!"
+      Gumdrop.rebuild
+    end
+  rescue LoadError
+    say "Error: Watch requires the listen gem, be sure and add it to your Gemfile!"
+  rescue => ex
+    say "Error: #{ ex }"
+  end
+
 end
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Matt McCray
@@ -83,7 +83,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: listen
+  name: i18n
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -96,7 +96,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: bundle
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -109,7 +109,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bundle
+  name: minitest
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -119,10 +119,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: sqlite3
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -135,7 +135,7 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: sprockets
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -148,7 +148,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: sprockets
+  name: stitch
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -161,7 +161,7 @@ dependencies:
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: stitch
+  name: jsmin
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -173,19 +173,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: jsmin
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id013
 description: The sweet 'n simple cms and prototyping tool for creating static html websites and webapps.
 email: matt@elucidata.net
 executables: