gumdrop 0.7.5 → 0.8.0

data/templates/default/Gumdrop

@@ -1,4 +1,3 @@
-puts "Gumdrop v#{Gumdrop::VERSION} building..."
 
 configure do
 
@@ -72,6 +71,13 @@ generate do
    
 end
 
+# All Gumdrop Hooks: on_start, on_before_scan, on_scan, on_before_generate, on_generate, on_before_render, on_render, on_end
+on_start do |site|
+  puts "Gumdrop v#{Gumdrop::VERSION} building..."
+end
+# on_end do |site|  end
+
+
 # Example of using a content filter to compress CSS output
 # require 'yui/compressor'
 # content_filter do |content, info|
@@ -104,7 +110,27 @@ view_helpers do
 
 end
 
+# Add (thor) tasks to gumdrop command
+# for more: https://github.com/wycats/thor/wiki
+# tasks do
+  
+  # desc 'sync', "Syncs with public server using rsync (if configured)"  
+  # method_option :build, :aliases => '-b', :desc => 'Build content before syncing'
+  # method_option :dry_run, :aliases => '-d', :desc => 'Dry run'
+  # def sync
+  #   SITE.build if options[:build]
+  #   config= SITE.config
+  #   output= SITE.config.output_dir
+  #   cmd= "rsync -avz --delete #{output} #{config.server_user}@#{config.server}:#{config.server_path}"
+  #   puts "Running:\n#{cmd}\n"
+  #   system(cmd) unless options[:dry_run]
+  # end
+
+# end
+
+
 # Any specialized code for your site goes here...
 
 require 'slim'
 Slim::Engine.set_default_options pretty:true
+

data/templates/default/Rakefile

@@ -7,26 +7,16 @@ USER='user'
 SERVER='server.com'
 FOLDER="~/#{SERVER}"
 
-# Build folder (change if you change Gumdrop.config.output_dir)
-OUTPUT="output/"
-
 desc "Build source files into output_dir"
 task :build do
-  system("bundle exec gumdrop -b")
+  Gumdrop::CLI::Internal.new.build
 end
 
 desc "Run development server"
-task :serve do
-  system("bundle exec gumdrop -s")
-end
-
-desc "Syncs with public server using rsync (if configured)"
-task :sync do
-  cmd= "rsync -avz --delete #{OUTPUT} #{USER}@#{SERVER}:#{FOLDER}"
-  puts "Running:\n#{cmd}\n"
-  system(cmd)
-  puts "Done."
+task :server do
+  Gumdrop::CLI::Internal.new.server
 end
+task :serve => :server
 
 desc "Outputs the Gumdrop version"
 task :version do
@@ -35,4 +25,14 @@ end
 
 task :default do
   puts `rake -T`
-end
+end
+
+desc "Syncs with public server using rsync (if configured)"
+task :sync do
+  site= Gumdrop::Site.new Gumdrop.fetch_site_file
+  output= File.expand_path site.config.output_dir
+  cmd= "rsync -avz --delete #{output} #{USER}@#{SERVER}:#{FOLDER}"
+  puts "Running:\n#{cmd}\n"
+  system(cmd)
+  puts "Done."
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 5
-  version: 0.7.5
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Matt McCray
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-27 00:00:00 -05:00
+date: 2012-06-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: listen
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -70,7 +70,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: thor
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -83,7 +83,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bundle
+  name: i18n
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -95,6 +95,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: bundle
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: The sweet 'n simple cms/prototyping tool for creating static html websites and webapps.
 email: matt@elucidata.net
 executables: 
@@ -107,26 +120,30 @@ files:
 - .gitignore
 - ChangeLog.md
 - Gemfile
+- Gemfile.lock
 - License
 - Rakefile
 - Readme.md
 - bin/gumdrop
 - gumdrop.gemspec
 - lib/gumdrop.rb
-- lib/gumdrop/callbacks.rb
-- lib/gumdrop/cli.rb
+- lib/gumdrop/cli/external.rb
+- lib/gumdrop/cli/internal.rb
 - lib/gumdrop/content.rb
 - lib/gumdrop/context.rb
 - lib/gumdrop/data_manager.rb
 - lib/gumdrop/generator.rb
-- lib/gumdrop/hash_object.rb
-- lib/gumdrop/proxy_handler.rb
 - lib/gumdrop/server.rb
 - lib/gumdrop/site.rb
-- lib/gumdrop/sprockets_support.rb
-- lib/gumdrop/stitch_support.rb
+- lib/gumdrop/support/base_packager.rb
+- lib/gumdrop/support/callbacks.rb
+- lib/gumdrop/support/hash_object.rb
+- lib/gumdrop/support/proxy_handler.rb
+- lib/gumdrop/support/sprockets.rb
+- lib/gumdrop/support/stitch.rb
 - lib/gumdrop/version.rb
 - lib/gumdrop/view_helpers.rb
+- notes.md
 - specs/content_spec.rb
 - specs/deferred_loader_spec.rb
 - specs/fixtures/expected/posts/post1.html
@@ -172,7 +189,6 @@ files:
 - templates/backbone/source/theme/templates/site.template.slim
 - templates/blank/Gemfile
 - templates/blank/Gumdrop
-- templates/blank/Rakefile
 - templates/default/Gemfile
 - templates/default/Gumdrop
 - templates/default/Rakefile

data/lib/gumdrop/cli.rb

@@ -1,167 +0,0 @@
-
-require 'trollop'
-
-banner_text= <<-EOS
-
-Gumdrop v#{ Gumdrop::VERSION }
-The simple, sweet, static CMS.
-
-EOS
-
-opts = Trollop::options do
-  banner banner_text
-
-  # opt :verbose,"Verbose output"
-  # opt :debug,  "Enable debugging output"
-  opt :quiet,  "No console output"
-
-  if Gumdrop.in_site_folder?
-    banner <<-EOS
-
-Examples:
-  gumdrop --build
-  gumdrop -b
-  gumdrop --new Post
-  gumdrop --server
-  gumdrop -s -p 8080 -r
-
-Options:
-EOS
-    opt :build,  "Build HTML output"
-      opt :environment, "Specify config.env", :type=>String, :default=>'production'
-    opt :new, "Create new data item (specify collection name)", :type=>String
-    opt :server, "Runs development server"
-      opt :port, "Specifies port to run server on", :type=>:int
-      opt :reload, "Force reloading on dev server"
-    opt :template, "Create local template from this site (specify template name)", :type=>String
-  else
-    banner <<-EOS
-
-Examples:
-  gumdrop --create my_site
-  gumdrop -c new_site --template backbone
-
-Options:
-EOS
-    opt :create, "Create a gumdrop project", :type=>String
-    opt :template, "Template to create new project from", :type=>String, :default=>'default'
-    opt :list, "List available templates"
-  end
-
-end
-
-# NO COMMANDS GIVEN
-
-unless opts[:create_given] or opts[:build_given] or opts[:server_given] or opts[:new_given] or opts[:template_given] or opts[:list_given]
-  puts banner_text
-  Trollop::die "No commands specified"
-end
-
-Gumdrop::DEFAULT_OPTIONS[:env]= opts[:environment] || 'production'
-
-# BUILD
-
-if opts[:build_given]
-  puts banner_text unless opts[:quiet_given]
-  Gumdrop.run(opts)
-
-
-# SERVER
-
-elsif opts[:server_given]
-  puts banner_text unless opts[:quiet_given]
-  Gumdrop::Server
-
-
-# LIST TEMPLATES
-
-elsif opts[:list_given]
-  # List templates
-  puts banner_text unless opts[:quiet_given]
-  here= File.dirname(__FILE__)
-  lib_dir= File.expand_path File.join(here, '../../templates', '*')
-  user_dir=  File.expand_path File.join("~", ".gumdrop", "templates", "*")
-  puts "Gem Templates:"
-  Dir[lib_dir].each do |name|
-    puts "  #{File.basename name}" if File.directory?(name)
-  end
-  puts "Local Templates:"
-  Dir[user_dir].each do |name|
-    puts "  #{File.basename name}" if File.directory?(name)
-  end
-
-
-# NEW DATA COLLECTION ITEM
-
-elsif opts[:new_given]
-  puts banner_text unless opts[:quiet_given]
-  puts "Not implemented yet..."
-
-
-# CREATE NEW SITE
-
-elsif opts[:create_given]
-  puts banner_text unless opts[:quiet_given]
-
-  require 'fileutils'
-  here= File.dirname(__FILE__)
-  lib_root= File.expand_path File.join(here, '../../')
-  user_gumdrop_dir=  File.expand_path File.join("~", ".gumdrop")
-  there= File.expand_path( opts[:create] )
-  template_name = opts[:template]
-  
-  if File.file? there
-    puts "You cannot specify a file as the target!" 
-  elsif !File.directory? there
-    FileUtils.mkdir_p there
-  end
-  
-  # from gem...
-  if File.directory? File.join(lib_root, 'templates', template_name)
-    # FileUtils.cp_r Dir[File.join(here, "template", template_name, "*")], there
-    puts "Creating gumdrop project (from template:#{template_name})"
-    puts "  #{there}"
-    FileUtils.cp_r File.join(lib_root, "templates", template_name, "."), there
-    puts "Done."
-
-  # local template...
-  elsif File.directory? File.join(user_gumdrop_dir, 'templates', template_name)
-    # FileUtils.cp_r Dir[File.join(here, "template", template_name, "*")], there
-    puts "Creating gumdrop project (from local template:#{template_name})"
-    puts "  #{there}"
-    FileUtils.cp_r File.join(user_gumdrop_dir, "templates", template_name, "."), there
-    puts "Done."
-
-  else
-    puts "Invalid template '#{template_name}'!"
-  end
-
-
-# SAVE CURRENT SITE AS TEMPLATE
-
-elsif opts[:template_given]
-  # Save as template...
-  puts banner_text unless opts[:quiet_given]
-  template= opts[:template]
-  template_path = File.expand_path File.join('~', '.gumdrop', 'templates', template)
-  if File.exists? template_path
-    puts "A template named '#{template}' already exists!"
-  else
-    require 'fileutils'
-    puts "Creating template:  #{template}"
-    puts "  ~/.gumdrop/templates/#{template}"
-    site_root= Gumdrop.site_folder
-    FileUtils.mkdir_p File.dirname(template_path)
-    FileUtils.cp_r File.join(site_root, "."), template_path
-    puts "Done."
-  end
-  
-
-# UNKNOWN COMMAND
-
-else
-  puts banner_text
-  require 'pp'
-  puts "Unknown options"
-  pp opts
-end

data/lib/gumdrop/sprockets_support.rb

@@ -1,3 +0,0 @@
-require 'sprockets'
-
-# Any sprockets extentions/helpers

data/lib/gumdrop/stitch_support.rb

@@ -1,114 +0,0 @@
-
-require 'stitch-rb'
-
-class Stitch::Source
-  # Patch for gumdrop style filenames
-  def name
-    name = path.relative_path_from(root)
-    name = name.dirname + name.basename(".*")
-    name.to_s.gsub(".js", '')
-  end
-end
-
-
-# Custom Compilers
-
-
-class SerenadeCompiler < Stitch::Compiler
-  
-  extensions :serenade
-  
-  def compile(path)
-    content= File.read(path)
-    viewname= File.basename(path).gsub('.serenade', '').gsub('.html', '').gsub('.', '_')
-    %{
-      Serenade.view(#{ viewname.to_json }, #{content.to_json});
-    }
-  end
-  
-end
-
-# Not so sure on this one...
-class HoganCompiler < Stitch::Compiler
-  # List of supported extensions
-  extensions :mustache
-
-  # A compile method which takes a file path,
-  # and returns a compiled string
-  def compile(path)
-    content = File.read(path)
-    %{
-      var template = Hogan.compile(#{content.to_json});
-      module.exports = (function(data){ return template.render(data); });
-    }
-  end
-end
-
-module CssJsCode
-  
-  def export_js_code(path)
-    content= File.read(path)
-    %{
-      var css = #{ transpile(content, File.extname(path)).to_json },
-          node = null;
-      module.exports= {
-        content: css,
-        add: function(to){
-          if(node != null) return;
-          if(to == null) to= document.getElementsByTagName('HEAD')[0] || document.body;
-          node= document.createElement('style');
-          node.innerHTML= css;
-          to.appendChild(node);
-          return this;
-        },
-        remove: function() {
-          if(node != null) {
-            node.parentNode.removeChild(node);
-            node = null;
-          }
-          return this;
-        }
-      };
-    }
-  end
-
-  def transpile(content, ext)
-    content
-  end
-
-end
-
-class CssCompiler < Stitch::Compiler
-  include CssJsCode
-
-  extensions :css
-
-  def compile(path)
-    export_js_code path
-  end
-
-end
-
-
-begin
-  require 'sass'
-
-  class SassCompiler < Stitch::Compiler
-    include CssJsCode
-
-    extensions :sass, :scss
-
-    def compile(path)
-      export_js_code path
-    end
-
-    def transpile(content, ext)
-      type = (ext == '.sass') ? :sass : :scss
-      Sass::Engine.new(content, :syntax=>type).render
-    end
-  end
-
-rescue
-  # Sass Not available
-end
-