simple-templater 0.0.1.4 → 0.0.1.5

data/.gitignore

@@ -0,0 +1,9 @@
+/*.gem
+
+.DS_Store
+.cache
+.yardoc
+
+script/*
+gems/*
+!gems/cache

data/Gemfile

@@ -1,5 +1,10 @@
+# configuration
 bundle_path "gems"
+bin_path "script"
+disable_rubygems
 
+# gems
+gem "nake"
 gem "erubis"
 
 gem "haml"
@@ -8,5 +13,3 @@ gem "erubis"
 only(:test) do
   gem "rspec"
 end
-
-bin_path "script"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jakub Šťastný aka Botanicus
+Copyright (c) 2009 – 2010 Jakub Šťastný aka Botanicus
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/bin/simple-templater

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.9
+#!/usr/bin/env ruby
 # encoding: utf-8
 
 # --list (scope): list all generators available for given scope or just list all generators
@@ -37,17 +37,21 @@ require "simple-templater"
 def usage
 <<-HELP
 === Usage ===
-rango create project mycoolproject    Generate new site
-rango create app mycoolapp            Generate new application
+simple-templater create project mycoolproject    Generate new site
+simple-templater create app mycoolapp            Generate new application
 HELP
 end
 
 begin
-  ARGV.shift # create
-  generator_name = ARGV.shift
+  begin
+    ARGV.shift # create
+  rescue
+    usage
+  end
+  generator_name = ARGV.shift || abort(usage)
   templater = SimpleTemplater.new(:simple_templater)
   # This enables you to create custom generators for Rango
-  load "simple-templater.scope" # neccesary if we run rango locally and not from RubyGems
+  load File.join(File.dirname(__FILE__), "../simple-templater.scope") # neccesary if we run rango locally and not from RubyGems
   templater.discover!
   generator_set = templater.find(generator_name)
   if generator_set.nil?

data/lib/simple-templater/builder.rb

@@ -21,7 +21,7 @@ class SimpleTemplater
   class Builder
     def self.create(*args)
       templater = self.new(*args)
-      puts("Context: #{templater.context.inspect}")
+      puts "Context: #{templater.context.inspect}"
       templater.create
     end
 
@@ -84,9 +84,9 @@ class SimpleTemplater
 
       if template.end_with?(".rbt")
         if File.exist?(file)
-          puts("[RETEMPLATE] #{file} (from #{template})")
+          puts "[RETEMPLATE] #{file} (from #{template})"
         else
-          puts("[TEMPLATE] #{file} (from #{template})")
+          puts "[TEMPLATE] #{file} (from #{template})"
         end
         File.open(file, "w") do |file|
           eruby = Erubis::Eruby.new(File.read(template))
@@ -104,10 +104,10 @@ class SimpleTemplater
           # do nothing
           # it shouldn't get here never, we have File.directory? above
         elsif File.file?(file)
-          puts("[RECOPY] #{file} (from #{template})")
+          puts "[RECOPY] #{file} (from #{template})"
           FileUtils.cp_f(template, file)
         else
-          puts("[COPY] #{file} (from #{template})")
+          puts "[COPY] #{file} (from #{template})"
           FileUtils.cp(template, file)
         end
       end

data/lib/simple-templater/generator.rb

@@ -65,9 +65,9 @@ class SimpleTemplater
       if self.full? && Dir.exist?(self.target) # has to run after setup.rb hook, because setup.rb can manipulate with target
         raise TargetAlreadyExist, "#{self.target} already exist, aborting."
       end
-      puts("[#{self.name} generator] Running before hooks #{self.before_hooks.inspect}")
+      puts "[#{self.name} generator] Running before hooks #{self.before_hooks.inspect}"
       self.run_hooks(:before)
-      puts("[#{self.name} generator] Creating #{@target} (#{self.config.type})")
+      puts "[#{self.name} generator] Creating #{@target} (#{self.config.type})"
       if self.flat?
         # flat/content/flat.ru.rbt
         # flat/content/%user%.rb
@@ -85,9 +85,9 @@ class SimpleTemplater
 
     def run_hook(basename)
       if File.exist?(hook = file(basename))
-        puts("Running #{basename} hook")
+        puts "Running #{basename} hook"
         DSL.new(self).instance_eval(File.read(hook))
-        puts("Finished")
+        puts "Finished"
       end
     rescue Exception => exception
       abort "Exception #{exception.inspect} occured during running #{basename}\n#{exception.backtrace.join("\n")}"

data/lib/simple-templater/helpers.rb

@@ -6,7 +6,7 @@ class SimpleTemplater
   module Helpers
     extend self
 
-    def shebang(executable = rubypath, *args)
+    def shebang(executable = ruby_basename, *args)
       if RUBY_PLATFORM.match(/darwin/)
         self.env_shebang(executable, args)
       else
@@ -14,7 +14,7 @@ class SimpleTemplater
       end
     end
 
-    def plain_shebang(executable = rubypath, *args)
+    def plain_shebang(executable = ruby_basename, *args)
       "#!#{executable} #{args.join(" ")}".chomp(" ")
     end
 

data/lib/simple-templater/hooks/hook.rb

@@ -37,11 +37,11 @@ class SimpleTemplater
       def self.invoke(context)
         hook = self.new(context)
         if hook.will_run?
-          puts("Running hook #{self}")
+          puts "Running hook #{self}"
           hook.run
           return true
         else
-          puts("Skipping hook #{self}")
+          puts "Skipping hook #{self}"
           return false
         end
       end

data/lib/simple-templater.rb

@@ -1,11 +1,19 @@
 #!/usr/bin/env ruby -Ivendor/erubis/lib:vendor/abstract/lib:vendor/cli/lib
 # encoding: utf-8
 
+class Hash
+  def reverse_merge!(hash)
+    self.replace(hash.merge(self))
+  end
+end
+
 require "simple-templater/core_exts"
 require "simple-templater/discoverer"
 require "simple-templater/generator_set"
 
 class SimpleTemplater
+  VERSION ||= "0.0.1.5"
+
   GeneratorNotFound ||= Class.new(StandardError)
   TargetAlreadyExist ||= Class.new(StandardError)
 

data/simple-templater.gemspec

@@ -2,7 +2,8 @@
 # encoding: utf-8
 
 # NOTE: we can't use require_relative because when we run gem build, it use eval for executing this file
-require File.join(File.dirname(__FILE__), "lib", "simple-templater", "version")
+require File.join(File.dirname(__FILE__), "lib", "simple-templater")
+require "base64"
 
 Gem::Specification.new do |s|
   s.name = "simple-templater"
@@ -12,12 +13,13 @@ Gem::Specification.new do |s|
   s.summary = "SimpleTemplater is dead-simple solution for creating generators."
   s.description = "SimpleTemplater is dead-simple solution for creating generators. It strongly uses convention over configuration, so you don't have to write loads of code to generate one stupid plain text README."
   s.cert_chain = nil
-  s.email = ["knava.bestvinensis", "gmail.com"].join("@")
+  s.email = Base64.decode64("c3Rhc3RueUAxMDFpZGVhcy5jeg==\n")
   s.has_rdoc = true
 
   # files
-  s.files = Dir.glob("**/*") - Dir.glob("pkg/*")
-  s.executables = ["simple-templater"]
+  s.files = `git ls-files`.split("\n")
+
+  Dir["bin/*"].map(&File.method(:basename))
   s.default_executable = "simple-templater"
   s.require_paths = ["lib"]
 
@@ -26,12 +28,21 @@ Gem::Specification.new do |s|
 
   # runtime dependencies
   s.add_dependency "cli"
+  s.add_dependency "term-ansicolor"
   s.add_dependency "erubis" # for generators
 
   # development dependencies
   # use gem install simple-templater --development if you want to install them
   # s.add_development_dependency "erubis" # for generators
 
+  begin
+    require "changelog"
+  rescue LoadError
+    warn "You have to have changelog gem installed for post install message"
+  else
+    s.post_install_message = CHANGELOG.new.version_changes
+  end
+
   # RubyForge
   s.rubyforge_project = "simple-templater"
 end

data/spec/simple-templater/hooks/hook_spec.rb

@@ -2,7 +2,6 @@
 
 require "ostruct"
 require_relative "../../spec_helper"
-require "rubyexts/capture_io"
 require "simple-templater/hooks/hook"
 
 # factories

data/spec/simple-templater/hooks/postprocess/git_repository_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require "fileutils"
-require "rubyexts/capture_io"
 require_relative "../../../spec_helper"
 require "simple-templater/hooks/postprocess/git_repository"
 

data/spec/spec_helper.rb

@@ -6,6 +6,39 @@ $:.unshift(File.expand_path(File.join(SPEC_ROOT, "..", "lib")))
 require "spec" # so you can run ruby spec/rango/whatever_spec.rb
 # require "fakefs" # TODO: makes some troubles with rubyexts
 
+require "stringio"
+
+def STDOUT.capture(&block)
+  before = self
+  $stdout = StringIO.new
+  block.call
+  $stdout.rewind
+  output = $stdout.read
+  $stdout = before
+  output
+end
+
+# @example STDOUT.capture { puts "hi" }
+# # => "hi"
+def STDERR.capture(&block)
+  before = self
+  $stderr = StringIO.new
+  block.call
+  $stderr.rewind
+  output = $stderr.read
+  $stderr = before
+  output
+end
+
+# @example STDIN.capture("yes") { ask("Do you hear me?") }
+# # => "yes"
+def STDIN.capture(default, &block)
+  STDIN.reopen "/dev/null" # so we don't get the fucking prompt
+  STDIN.ungetbyte(default) # so the default value can be get by STDIN.getc & similar methods
+  block.call
+  # TODO: how I can get back the original STDIN?
+end
+
 module Spec
   module Matchers
     def match(expected)

data/spec/stubs/test_generator/test_generator.gemspec

@@ -1,4 +1,4 @@
-#!/usr/bin/env gem1.9 build
+#!/usr/bin/env gem build
 # encoding: utf-8
 
 # Run thor package:gem or gem build simple-templater.gemspec

data/stubs/project/content/%name%.gemspec.rbt

@@ -1,14 +1,15 @@
-#!/usr/bin/env gem1.9 build
+#!/usr/bin/env gem build
 # encoding: utf-8
 
 # Run ./<%= @name %>.gemspec or gem build <%= @name %>.gemspec
 # NOTE: we can't use require_relative because when we run gem build, it use eval for executing this file
-require File.join(File.dirname(__FILE__), "lib", "<%= @name %>")
+require File.join(File.dirname(__FILE__), "lib", "<%= @name %>", "version")
+require "base64"
 
 Gem::Specification.new do |s|
   s.name = "<%= @name %>"
   s.version = <%= @constant %>::VERSION
-  s.authors = ["<%= @name %>"]
+  s.authors = ["<%= @full_name %>"]
   s.homepage = "http://github.com/<%= @github_user %>/<%= @github_repository %>"
   s.summary = "" # TODO: summary
   s.description = "" # TODO: long description
@@ -17,8 +18,9 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   # files
-  s.files = Dir.glob("**/*") - Dir.glob("pkg/*")
-  s.executables = Dir["bin/*"].map { |script| File.basename(script) }
+  s.files = `git ls-files`.split("\n")
+
+  s.executables = Dir["bin/*"].map(&File.method(:basename))
   s.default_executable = "<%= @name %>"
   s.require_paths = ["lib"]
 
@@ -29,9 +31,17 @@ Gem::Specification.new do |s|
   # s.add_dependency "my-gem"
 
   # development dependencies
-  # use gem install rango --development if you want to install them
+  # use gem install <%= @name %> --development if you want to install them
   # s.add_development_dependency "simple-templater"
 
+  begin
+    require "changelog"
+  rescue LoadError
+    warn "You have to have changelog gem installed for post install message"
+  else
+    s.post_install_message = CHANGELOG.new.version_changes
+  end
+
   # RubyForge
   s.rubyforge_project = "<%= @name %>"
 end

data/stubs/project/content/%name%.pre.gemspec.rbt

@@ -0,0 +1,8 @@
+#!/usr/bin/env gem build
+# encoding: utf-8
+
+# You might think this is a terrible mess and guess what, you're
+# right mate! However say thanks to authors of RubyGems, not me.
+eval(File.read("<%= @name %>.gemspec")).tap do |specification|
+  specification.version = "#{specification.version}.pre"
+end

data/stubs/project/content/.gitignore

@@ -0,0 +1,12 @@
+*~
+.*.swp
+.#*
+
+.DS_Store
+.cache
+.yardoc
+
+/*.gem
+script/*
+gems/*
+!gems/cache

data/stubs/project/content/CHANGELOG

@@ -1,2 +1,2 @@
 = Version 0.0.1
-  * 
+  * Initial import

data/stubs/project/content/Gemfile

@@ -0,0 +1,8 @@
+# gems
+gem "nake"
+gem "rspec"
+gem "code-cleaner"
+
+# settings
+bin_path "script"
+bundle_path "gems"

data/stubs/project/content/README.textile.rbt

@@ -4,8 +4,8 @@ h1. About
 
 h1. Installation
 
-* Prerelease: @sudo gem install <%= @name %> --development --prerelease@
-* Stable version: @sudo gem install <%= @name %> --development@
+* Prerelease: @gem install <%= @name %> --development --prerelease@
+* Stable version: @gem install <%= @name %> --development@
 
 h1. Usage
 

data/stubs/project/content/bin/%name%.rbt

@@ -11,4 +11,5 @@ end
 
 require "<%= @name %>"
 
+# TODO: some default args parsing, --version, --help maybe use optparse or so
 # TODO: write the code

data/stubs/project/content/lib/%name%/version.rb.rbt

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+module <%= @constant %>
+  VERSION = "0.0.1"
+end

data/stubs/project/content/lib/%name%.rb.rbt

@@ -1,5 +1,4 @@
 # encoding: utf-8
 
 module <%= @constant %>
-  VERSION ||= "0.0.1"
 end

data/stubs/project/content/tasks.rb.rbt

@@ -0,0 +1,37 @@
+#!./script/nake
+# encoding: utf-8
+
+begin
+  require_relative "gems/environment.rb"
+rescue LoadError
+  abort "You have to install bundler and run gem bundle first!"
+end
+
+ENV["PATH"] = "script:#{ENV["PATH"]}"
+
+require "nake/tasks/gem"
+require "nake/tasks/spec"
+require "nake/tasks/release"
+
+require_relative "lib/<%= @name %>/version"
+
+begin
+  load "code-cleaner.nake"
+  Nake::Task["hooks:whitespace:install"].tap do |task|
+    task.config[:path] = "script"
+    task.config[:encoding] = "utf-8"
+    task.config[:whitelist] = '(bin/[^/]+|.+\.(rb|rake|nake|thor|task))$'
+  end
+rescue LoadError
+  warn "If you want to contribute to <%= @constant %>, please install code-cleaner and then run ./tasks.rb hooks:whitespace:install to get Git pre-commit hook for removing trailing whitespace."
+end
+
+# Setup encoding, so all the operations
+# with strings from another files will work
+Encoding.default_internal = "utf-8"
+Encoding.default_external = "utf-8"
+
+Task[:build].config[:gemspec] = "<%= @name %>.gemspec"
+Task[:prerelease].config[:gemspec] = "<%= @name %>.pre.gemspec"
+Task[:release].config[:name] = "<%= @name %>"
+Task[:release].config[:version] = <%= @constant %>::VERSION

data/tasks.rb

@@ -0,0 +1,37 @@
+#!./script/nake
+# encoding: utf-8
+
+begin
+  require_relative "gems/environment.rb"
+rescue LoadError
+  abort "You have to install bundler and run gem bundle first!"
+end
+
+ENV["PATH"] = "script:#{ENV["PATH"]}"
+
+require "nake/tasks/gem"
+require "nake/tasks/spec"
+require "nake/tasks/release"
+
+begin
+  load "code-cleaner.nake"
+  Nake::Task["hooks:whitespace:install"].tap do |task|
+    task.config[:path] = "script"
+    task.config[:encoding] = "utf-8"
+    task.config[:whitelist] = '(bin/[^/]+|.+\.(rb|rake|nake|thor|task))$'
+  end
+rescue LoadError
+  warn "If you want to contribute to SimpleTemplater, please install code-cleaner and then run ./tasks.rb hooks:whitespace:install to get Git pre-commit hook for removing trailing whitespace."
+end
+
+require_relative "lib/simple-templater"
+
+# Setup encoding, so all the operations
+# with strings from another files will work
+Encoding.default_internal = "utf-8"
+Encoding.default_external = "utf-8"
+
+Task[:build].config[:gemspec] = "simple-templater.gemspec"
+Task[:prerelease].config[:gemspec] = "simple-templater.pre.gemspec"
+Task[:release].config[:name] = "simple-templater"
+Task[:release].config[:version] = SimpleTemplater::VERSION