falsework 3.1.0 → 3.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 20ae0076a14312e81259c7d4e78978d02afc62d8
+  data.tar.gz: 8f891593bfeaf377ffe5a2051f8cba3e32ff73f3
+SHA512:
+  metadata.gz: 88aa196e56e9ca749db976f7dee047a8cedcc18e01dfb8f98014cf366ead9878b69f792e00d25abc6f00d632d9c3c416ed62a8bc994f22614eef4f9317e1e8f5
+  data.tar.gz: 835c2f9f6bb9512851dc519f68a440eccbf81da1291547688c0400ee7f7cade8776e82d248379879532625131f8fdc2bb4eea0176f033c9f3ddf078bc3cc81bd

data/.gitignore

@@ -1,2 +1,6 @@
 pkg
 html
+Gemfile.lock
+vendor
+.bundle
+.ph

data/doc/NEWS.rdoc

@@ -1,3 +1,13 @@
+=== 3.2.0
+
+Sun Apr  7 22:06:50 EEST 2013
+
+* Add coffee-chrome template.
+
+* Update deps version numbers.
+
+* Ruby is not cool anymore. It's time to move on.
+
 === 3.1.0
 
 Thu May 24 23:20:04 EEST 2012
@@ -71,11 +81,11 @@ Mon Nov  7 07:15:00 EET 2011
     # Don't remove this: falsework/0.2.8/naive/2011-08-05T16:59:19+03:00
 
   and replace it to:
-  
+
     # Don't remove this: falsework/0.2.8/ruby-naive/2011-08-05T16:59:19+03:00
 
   Then run 'falsework upgrade' as usual.
-	
+
 * Added 'c-glib' template.
 
 * '--no-git' CLO.

data/doc/template-tutorial.rdoc

@@ -84,7 +84,7 @@ When user types
 
 falsework looks info <tt>#config.yaml</tt> file in the <tt>c-glib</tt>
 template directory, searches for 'test' key and iterates on its value to
-read some file in the template directory, white that file somewhere and
+read some file in the template directory, write that file somewhere and
 set it permission afterwards.
 
 The default configuration is:
@@ -112,8 +112,8 @@ src::       A relative path to a file (that usually prefixed with
             '#' & hidden from a generator). When +src+ is +null+, the
             key is ignored and nothing is injected.
 
-dest::      Sub-key can have <tt>%s</tt> in it which will be replaced with
-            target value ('foobar' in the example above).
+dest::      A sub-key can have <tt>%s</tt> in it which will be replaced with
+            a target value ('foobar' in the example above).
 
 mode_int::  Permission bits.
 

data/falsework.gemspec

@@ -2,6 +2,8 @@
 require File.expand_path('../lib/falsework/meta', __FILE__)
 include Falsework
 
+require 'yaml'
+
 Gem::Specification.new do |gem|
   gem.authors       = [Meta::AUTHOR]
   gem.email         = [Meta::EMAIL]
@@ -11,7 +13,7 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split($\)
   gem.files.concat YAML.load_file('dynamic.yaml').keys
-  
+
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^test/test_.+\.rb})
   gem.name          = Meta::NAME
@@ -27,11 +29,11 @@ of #config.yaml has changed.
 
 See also doc/NEWS.rdoc file even if you don't have custom templates.
   MESSAGE
-  
+
   gem.add_dependency "open4", "~> 1.3.0"
-  gem.add_dependency "rdoc", "~> 3.12"
-  gem.add_dependency "bundler", "~> 1.1.3"
+  gem.add_dependency "rdoc", "~> 4.0.1"
+  gem.add_dependency "bundler", ">= 1.3"
   gem.add_dependency "git", "~>1.2.5"
 
-  gem.add_development_dependency "fakefs", "~> 0.4.0"
+  gem.add_development_dependency "fakefs", "~> 0.4.2"
 end

data/lib/falsework/meta.rb

@@ -2,7 +2,7 @@
 module Falsework
   module Meta # :nodoc:
     NAME = 'falsework'
-    VERSION = '3.1.0'
+    VERSION = '3.2.0'
     AUTHOR = 'Alexander Gromnitsky'
     EMAIL = 'alexander.gromnitsky@gmail.com'
     HOMEPAGE = 'http://github.com/gromnitsky/' + NAME

data/templates/c-glib/test/test_utils.c

@@ -24,7 +24,7 @@ test_my_strstrip()
 	GString *s = g_string_new("");
 
 	g_assert(!my_strstrip(NULL));
-	
+
 	char *t1[] = { "q", "\t  q\t", "\t\n\n  q\t\n\r", NULL };
 	char **p;
 	for (p = t1; *p; ++p) {
@@ -45,7 +45,7 @@ test_my_strstrip()
 	g_string_assign(s, "This is\na text & only text.");
 	my_strstrip(s);
 	g_assert_cmpstr("This is a text & only text.", ==, s->str);
-		
+
 	g_string_free(s, TRUE);
 }
 
@@ -79,15 +79,15 @@ test_chan_read()
 		{ "./mycat < semis/text/empty.txt", 0, "d41d8cd98f00b204e9800998ecf8427e" },
 		{ "./mycat < Makefile.test.mk", 2753, "f25fbc27b05cf7a33b6d01eb5a0bedb9" },
 		// delete this line if you don't have wordnet installed
-		{ "./mycat < /usr/local/share/WordNet/data.noun", 15300280, "a51f8a16db5be01db3ae95367469c6c7" },
+//		{ "./mycat < /usr/share/wordnet-3.0/dict/data.noun", 15300280, "a51f8a16db5be01db3ae95367469c6c7" },
 		{ NULL, -1, NULL }
 	};
-	
+
 	struct Cmd *p;
 	for (p = cmd; p->c; ++p) {
 		FILE* f = popen(p->c, "r");
 		g_assert(f);
-			
+
 		char buf[p->bytes];
 		gsize bytes = readn(fileno(f), buf, p->bytes);
 		pclose(f);
@@ -129,6 +129,6 @@ main (int argc, char **argv)
 	g_test_add_func("/utils/first", test_first);
 	g_test_add_func("/utils/chan_read", test_chan_read);
 	g_test_add_func("/utils/mylog_set", test_mylog_set);
-	
+
 	return g_test_run();
 }

data/templates/coffee-chrome/#config.yaml

@@ -0,0 +1,5 @@
+---
+test:
+- src: 'test/foo.coffee'
+  dest: 'test/%s.coffee'
+  mode_int: null

data/templates/coffee-chrome/.gitignore.#erb

@@ -0,0 +1,8 @@
+lib
+manifest.json
+.ph
+node_modules
+npm-debug.log
+*.zip
+*.crx
+private.pem

data/templates/coffee-chrome/Makefile

@@ -0,0 +1,45 @@
+M4 := m4
+JSON := json
+MOCHA := node_modules/.bin/mocha
+
+METADATA := package.json
+PKG := $(shell $(JSON) -a -d- name version < $(METADATA))
+PKG_FILES := $(shell $(JSON) files < $(METADATA) | $(JSON) -a)
+
+OPTS :=
+
+.PHONY: clobber clean manifest_clean compile_clean
+
+all: test
+
+test: compile
+	$(MOCHA) --compilers coffee:coffee-script -u tdd test $(OPTS)
+
+compile: node_modules manifest.json
+	$(MAKE) -C src compile
+
+include chrome.mk
+
+compile_clean:
+	$(MAKE) -C src clean
+
+node_modules: package.json
+	npm install
+	touch $@
+
+manifest.json: manifest.m4 $(METADATA)
+	$(M4) $< > $@
+
+manifest_clean:
+	rm -f manifest.json
+
+clean: manifest_clean compile_clean chrome_clean
+	[ -r lib ] && rmdir lib; :
+
+clobber: clean
+	rm -rf node_modules
+
+# Debug. Use 'gmake p-obj' to print $(obj) variable.
+p-%:
+	@echo $* = $($*)
+	@echo $*\'s origin is $(origin $*)

data/templates/coffee-chrome/README.md

@@ -0,0 +1,35 @@
+# <%= @classy %>
+
+Chrome 25+ extension.
+
+TODO: write a description
+
+## Build requirements:
+
+* jsontool in global mode.
+* GNU m4
+* xxd utility.
+* GNU make.
+
+## Compilation
+
+To compile, run
+
+    $ make compile
+
+To make a .crx file, you'll need a private RSA key named `private.pem`
+in the same directory where Makefile is. For testing purposes, generate
+it with openssl:
+
+    $ openssl genrsa -out private.pem 1024
+
+and run:
+
+    $ make crx
+
+If everything was fine, `<%= @project %>-x.y.z.crx` file will
+appear.
+
+## License
+
+MIT.

data/templates/coffee-chrome/chrome.mk

@@ -0,0 +1,32 @@
+# external 'compile' target required
+
+required := PKG PKG_FILES
+$(foreach idx,$(required),$(if $($(idx)),,$(error $(idx) variable is empty)))
+
+ZIP := zip
+ZIP2CRX:= ./zip2crx.sh
+PRIVATE_KEY := private.pem
+
+zipArchive := $(PKG).zip
+extension := $(PKG).crx
+
+.PHONY: zip zip_clean crx_clean crx chrome_clean
+
+zip_clean:
+	rm -f $(zipArchive)
+
+zip: zip_clean
+	$(ZIP) $(zipArchive) $(PKG_FILES)
+
+crx_clean:
+	rm -f $(extension)
+
+chrome_clean: zip_clean crx_clean
+
+crx: crx_clean compile zip
+	@if [ -r $(PRIVATE_KEY) ] ; then \
+		$(ZIP2CRX) $(zipArchive) $(PRIVATE_KEY); \
+	else \
+		echo crx: $(PRIVATE_KEY) not found; \
+		exit 1 ; \
+	fi

data/templates/coffee-chrome/manifest.m4

@@ -0,0 +1,10 @@
+{
+	"manifest_version": 2,
+	"name": "<%= @classy %>",
+	"description": "TODO: add a description",
+	"version": "syscmd(`json < package.json version | tr -d \\n')",
+
+	"background": {
+		"scripts": ["lib/background.js"]
+	}
+}

data/templates/coffee-chrome/package.json

@@ -0,0 +1,21 @@
+{
+	"files": [
+		"lib/background.js",
+		"manifest.json"
+	],
+	"name": "<%= @project %>",
+	"version": "0.0.1",
+	"license": {
+		"type": "MIT",
+		"url": "http://www.opensource.org/licenses/mit-license.php"
+	},
+	"repository": {
+		"type": "git",
+		"url": "http://github.com/<%= @user %>/<%= @project %>"
+	},
+	"dependencies": {
+		"coffee-script": "~1.6.2",
+		"browserify": "~2.6.0",
+		"mocha": "~1.8.2"
+	}
+}

data/templates/coffee-chrome/src/.gitignore.#erb

@@ -0,0 +1 @@
+*.js

data/templates/coffee-chrome/src/Makefile

@@ -0,0 +1,38 @@
+BROWSERIFY := ../node_modules/.bin/browserify
+COFFEE := ../node_modules/.bin/coffee
+
+out := ../lib
+html := $(wildcard *.html)
+out_html := $(patsubst %.html,$(out)/%.html,$(html))
+
+# compiled & bundled this will go to $(out)
+coffee := background.coffee
+
+out_js := $(patsubst %.coffee,$(out)/%.js,$(coffee))
+temp_js := $(patsubst %.coffee,%.js,$(wildcard *.coffee))
+
+.PHONY: compile clean
+
+all: compile
+
+#$(out)/background.js: foo.js
+
+%.js: %.coffee
+	$(COFFEE) -c $<
+
+$(out)/%.js: %.js
+	@mkdir -p `dirname $@`
+	$(BROWSERIFY) $< -o $@
+
+$(out)/%.html: %.html
+	cp $< $@
+
+compile: $(temp_js) $(out_js) $(out_html)
+
+clean:
+	rm -f $(out_js) $(temp_js) $(out_html)
+
+# Debug. Use 'gmake p-obj' to print $(obj) variable.
+p-%:
+	@echo $* = $($*)
+	@echo $*\'s origin is $(origin $*)

data/templates/coffee-chrome/src/background.coffee

@@ -0,0 +1 @@
+console.log "loaded"

data/templates/coffee-chrome/test/foo.coffee

@@ -0,0 +1,7 @@
+assert = require 'assert'
+
+suite 'Ignorance Is Strength', ->
+    setup ->
+
+    test 'War Is Peace', ->
+        assert.ok("Freedom Is Slavery")

data/templates/coffee-chrome/zip2crx.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# On Fedora, xxd is in vim-common package.
+
+[ $# -ne 2 ] && {
+	echo "Usage: `basename $0` file.zip private_key" 1>&2
+	exit 1
+}
+
+zip=$1
+key=$2
+
+name=$(basename "$zip" .zip)
+crx="$name.crx"
+pub="$name.pub"
+sig="$name.sig"
+zip="$name.zip"
+trap 'rm -f "$pub" "$sig"' EXIT
+
+# signature
+openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig"
+
+# public key
+openssl rsa -pubout -outform DER < "$key" > "$pub" 2>/dev/null
+
+byte_swap() {
+	# Take "abcdefgh" and return it as "ghefcdab"
+	echo "${1:6:2}${1:4:2}${1:2:2}${1:0:2}"
+}
+
+crmagic_hex="4372 3234" # Cr24
+version_hex="0200 0000" # 2
+pub_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$pub" | awk '{print $5}')))
+sig_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$sig" | awk '{print $5}')))
+(
+  echo "$crmagic_hex $version_hex $pub_len_hex $sig_len_hex" | xxd -r -p
+  cat "$pub" "$sig" "$zip"
+) > "$crx"

data/templates/ruby-cli/%%@project%%.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.2'
   gem.extra_rdoc_files      = gem.files.grep(%r{^doc/})
   gem.rdoc_options << '-m' << 'doc/README.rdoc'
-  
+
   gem.add_dependency "open4", "~> 1.3.0"
-  gem.add_dependency "rdoc", "~> 3.12"
-  gem.add_dependency "bundler", "~> 1.1.3"
+  gem.add_dependency "rdoc", "~> 4.0.1"
+  gem.add_dependency "bundler", ">= 1.3"
 end

data/test/test_cli.rb

@@ -51,12 +51,13 @@ class TestCommandLine < MiniTest::Unit::TestCase
     Dir.chdir('templates/foo') {
       # check rake
       r = CliUtils.exec "rake -T"
+#      pp r
       assert_equal 0, r[0]
 
       # bundler targets test
       r = CliUtils.exec "rake build"
       assert_equal 0, r[0]
-      
+
       # add files
       r = CliUtils.exec "#{@cmd} exe qqq"
       assert_equal(0, r[0])
@@ -75,10 +76,10 @@ class TestCommandLine < MiniTest::Unit::TestCase
 #      pp r
       assert_equal 0, r[0]
       rm ['test/helper_cliutils.rb']
-      
+
       r = CliUtils.exec "#{@cmd} upgrade -b"
       assert_equal 0, r[0]
-      
+
       File.open('test/helper_cliutils.rb', 'w+') {|fp| fp.puts 'garbage' }
       r = CliUtils.exec "#{@cmd} upgrade -b --save"
       assert_equal 0, r[0]
@@ -90,7 +91,7 @@ class TestCommandLine < MiniTest::Unit::TestCase
       # upgrade info
       r = CliUtils.exec "#{@cmd} upgrade check"
       assert_equal 0, r[0]
-      
+
       r = CliUtils.exec "#{@cmd} upgrade list"
       assert_equal 0, r[0]
       assert_operator 1, :<=, r[2].split("\n").size
@@ -121,7 +122,7 @@ class TestCommandLine < MiniTest::Unit::TestCase
       r = CliUtils.exec "#{@cmd} -t c-glib test q-q-q"
       assert_equal(0, r[0])
       assert_equal(true, File.exist?('test/test_q_q_q.c'))
-      
+
       Dir.chdir('src') {
         r = CliUtils.exec "gmake"
         assert_equal 0, r[0]
@@ -144,7 +145,7 @@ class TestCommandLine < MiniTest::Unit::TestCase
     r = CliUtils.exec "#{@cmd} --config /NO_SUCH_FILE.yaml list dirs"
     assert_equal(0, r[0])
     assert_equal(2, r[2].split("\n").size)
-    
+
     r = CliUtils.exec "#{@cmd} --config templates/config-01.yaml list dirs"
     assert_equal(0, r[0])
     assert_equal(3, r[2].split("\n").size)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: falsework
 version: !ruby/object:Gem::Version
-  version: 3.1.0
-  prerelease: 
+  version: 3.2.0
 platform: ruby
 authors:
 - Alexander Gromnitsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,19 +69,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 description: A primitive scaffold generator for writing CLI programs in Ruby
 email:
 - alexander.gromnitsky@gmail.com
@@ -144,6 +133,18 @@ files:
 - templates/c-glib/test/mycat.c
 - templates/c-glib/test/semis/text/empty.txt
 - templates/c-glib/test/test_utils.c
+- templates/coffee-chrome/#config.yaml
+- templates/coffee-chrome/.gitignore.#erb
+- templates/coffee-chrome/Makefile
+- templates/coffee-chrome/README.md
+- templates/coffee-chrome/chrome.mk
+- templates/coffee-chrome/manifest.m4
+- templates/coffee-chrome/package.json
+- templates/coffee-chrome/src/.gitignore.#erb
+- templates/coffee-chrome/src/Makefile
+- templates/coffee-chrome/src/background.coffee
+- templates/coffee-chrome/test/foo.coffee
+- templates/coffee-chrome/zip2crx.sh
 - templates/ruby-cli/#config.yaml
 - templates/ruby-cli/%%@project%%.gemspec
 - templates/ruby-cli/.gitignore
@@ -175,14 +176,12 @@ files:
 - templates/ruby-cli/test/helper_cliutils.rb
 homepage: http://github.com/gromnitsky/falsework
 licenses: []
-post_install_message: ! 'Users of 2.x! Your custom templates must be updated--format
-
+metadata: {}
+post_install_message: |
+  Users of 2.x! Your custom templates must be updated--format
   of #config.yaml has changed.
 
-
-  See also doc/NEWS.rdoc file even if you don''t have custom templates.
-
-'
+  See also doc/NEWS.rdoc file even if you don't have custom templates.
 rdoc_options:
 - -m
 - doc/README.rdoc
@@ -191,22 +190,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A primitive scaffold generator for writing CLI programs in Ruby.
 test_files:
 - test/test_cli.rb