appmake 0.1.29 → 0.1.30

data/lib/appmake.rb

@@ -1,36 +1,22 @@
 require "thor"
+require "listen"
 require "appmake/version"
-require "appmake/listeners/css"
-require "appmake/listeners/coffee"
-require "appmake/listeners/js"
-require "appmake/listeners/tpl"
-require "appmake/installers/backbone"
-require "appmake/installers/bootstrap"
-require "appmake/installers/jquery"
-require "appmake/installers/underscore"
 
 module Appmake
-  class Appmake < Thor
+	class Appmake < Thor
 		include Thor::Actions
 
 		def self.source_root
 			File.dirname(File.dirname(__FILE__))
 		end
 
-		desc "init", "initialize new application"
-		{
-			:coffee => false,
-			:jquery => false,
-			:underscore => false,
-			:backbone => false,
-			:bootstrap => false
-		}.each do |op, default|
-			method_option op, :type => :boolean, :default => default
-		end
-
+		desc "init", "initialize new app"
+		method_option :coffee, :type => :boolean, :default => false
+		method_option :jquery, :type => :boolean, :default => false
+		method_option :underscore, :type => :boolean, :default => false
+		method_option :backbone, :type => :boolean, :default => false
+		method_option :bootstrap, :type => :boolean, :default => false
 		def init
-			shell = Color.new
-
 			template "templates/package.json.tt", "package.json"
 			template "templates/README.md.tt", "README.md"
 
@@ -45,73 +31,133 @@ module Appmake
 			template "templates/tpl/welcome.html.tt", "tpl/welcome.html"
 
 			empty_directory "public"
+			template "templates/public/index.html.tt", "public/index.html"
+
 			empty_directory "public/css"
 			empty_directory "public/js"
 			empty_directory "public/img"
-			template "templates/public/index.html.tt", "public/index.html"
-
-			shell.say_status :cmd, "npm install", :blue
-			system "npm install &> /dev/null"
 
-			if options.coffee
+			if options.coffee?
 				empty_directory "coffee"
-				Listeners::Coffee.compile
 			end
 
-			if options.jquery
-				Installers::Jquery.install
+			if options.jquery?
+				install "jquery"
 			end
 
-			if options.underscore
-				Installers::Underscore.install
+			if options.underscore?
+				install "underscore"
 			end
 
-			if options.backbone
-				Installers::Backbone.install
+			if options.backbone?
+				install "backbone"
 			end
 
-			if options.bootstrap
-				Installers::Bootstrap.install
+			if options.bootstrap?
+				install "bootstrap"
 			end
 
-			Listeners::Css.compile
-			Listeners::Tpl.compile
-			Listeners::Js.compile
+			run "npm install"
+
+			compile "css"
+			compile "tpl"
+			compile "coffee"
+			compile "js"
+		end
+
+		desc "compile", "compile files"
+		method_option :name, :type => :string
+		def compile(name)
+			if name == "css"
+				Dir.glob "css/*.scss" do |f|
+					name = f.split("/").last
+					if name[0] == name[0].upcase
+						new_name = name.gsub "scss", "css"
+						run "bundle exec sass css/#{name} public/css/#{new_name}"
+					end
+				end
+			elsif name == "js"
+				Dir.glob "js/*.js" do |f|
+					name = f.split("/").last
+					if name[0] == name[0].upcase
+						run "./node_modules/.bin/webmake js/#{name} public/js/#{name}"
+					end
+				end
+			elsif name == "tpl"
+				run "./node_modules/.bin/dot-module -d tpl/ -o js/templates.js"
+			elsif name == "coffee"
+				Dir.glob "coffee/*.coffee" do |f|
+					name = f.split("/").last
+					new_name = name.gsub "coffee", "js"
+					run "./node_modules/.bin/coffee -c coffee/#{name}"
+					run "mv coffee/#{new_name} js/#{new_name}"
+					if name[0] == name[0].upcase
+						run "./node_modules/.bin/webmake js/#{new_name} public/js/#{new_name}"
+					end
+				end
+			end
 		end
 
 		desc "watch", "watch for files to compile"
 		def watch
-			Listeners::Css.listen(false)
-			Listeners::Coffee.listen(false)
-			Listeners::Tpl.listen(false)
-			Listeners::Js.listen(true)
+			css = Listen.to "css", :filter => /\.scss$/
+			css.change do
+				compile "css"
+			end
+			css.start(false)
+
+			if Dir.exists? "coffee"
+				coffee = Listen.to "coffee", :filter => /\.coffee$/
+				coffee.change do
+					compile "coffee"
+				end
+				coffee.start(false)
+			end
+
+			tpl = Listen.to "tpl", :filter => /\.html$/
+			tpl.change do
+				compile "tpl"
+			end
+			tpl.start(false)
+
+			js = Listen.to "js", :filter => /\.js$/
+			js.change do
+				compile "js"
+			end
+			js.start(true)
 		end
 
-		desc "install", "install various libs"
+		desc "install", "install lib"
+		method_option :name, :type => :string
 		def install(name)
-			shell = Color.new
-
 			if name == "jquery"
 				empty_directory "public"
 				empty_directory "public/js"
-				Installers::Jquery.install
+				run "curl http://code.jquery.com/jquery-1.9.0.min.js -o public/js/jquery.min.js"
 			elsif name == "underscore"
 				empty_directory "public"
 				empty_directory "public/js"
-				Installers::Underscore.install
+				run "curl http://underscorejs.org/underscore-min.js -o public/underscore.min.js"
 			elsif name == "backbone"
 				empty_directory "public"
 				empty_directory "public/js"
-				Installers::Backbone.install
+				run "curl -silent http://backbonejs.org/backbone-min.js -o public/backbone.min.js"
 			elsif name == "bootstrap"
 				empty_directory "public"
 				empty_directory "public/css"
 				empty_directory "public/img"
 				empty_directory "public/js"
-				Installers::Bootstrap.install
+				run "curl -silent http://twitter.github.com/bootstrap/assets/bootstrap.zip -o public/bootstrap.zip"
+				run "unzip public/bootstrap.zip -d public"
+				run "mv public/bootstrap/js/bootstrap.min.js public/js/"
+				run "mv public/bootstrap/css/bootstrap.min.css public/css/"
+				run "mv public/bootstrap/css/bootstrap-responsive.min.css public/css/"
+				run "mv public/bootstrap/img/* public/img/"
+				run "rm -rf public/bootstrap"
+				run "rm public/bootstrap.zip"
 			else
-				abort "error: unsupported install: #{name}"
+				abort "error: cannot install #{name}"
 			end
 		end
 	end
-end
+end

data/lib/appmake/version.rb

@@ -1,3 +1,3 @@
 module Appmake
-  VERSION = "0.1.29"
+  VERSION = "0.1.30"
 end

data/templates/public/index.html.tt

@@ -3,9 +3,14 @@
 	<head>
 		<title></title>
 		<meta http=equiv="Content-Type" content="text/html; charset=UTF-8">
+		<% if options.bootstrap %><link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"><% end %>
 		<link rel="stylesheet" type="text/css" href="css/App.css">
 	</head>
 	<body>
+		<% if options.jquery %><script type="text/javascript" src="js/jquery.min.js"></script><% end %>
+		<% if options.underscore %><script type="text/javascript" src="js/underscore.min.js"></script><% end %>
+		<% if options.backbone %><script type="text/javascript" src="js/backbone.min.js"></script><% end %>
+		<% if options.bootstrap %><script type="text/javascript" src="js/bootstrap.min.js"></script><% end %>
 		<script type="text/javascript" src="js/App.js"></script>
 	</body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appmake
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
   prerelease: 
 platform: ruby
 authors:
@@ -93,14 +93,6 @@ files:
 - appmake.gemspec
 - bin/appmake
 - lib/appmake.rb
-- lib/appmake/installers/backbone.rb
-- lib/appmake/installers/bootstrap.rb
-- lib/appmake/installers/jquery.rb
-- lib/appmake/installers/underscore.rb
-- lib/appmake/listeners/coffee.rb
-- lib/appmake/listeners/css.rb
-- lib/appmake/listeners/js.rb
-- lib/appmake/listeners/tpl.rb
 - lib/appmake/version.rb
 - templates/README.md.tt
 - templates/css/app.scss.tt

data/lib/appmake/installers/backbone.rb

@@ -1,17 +0,0 @@
-require "thor"
-
-module Appmake
-	module Installers
-		class Backbone
-			include Thor::Shell
-
-			def self.install
-				shell = Color.new
-
-				shell.say_status :install, "Backbone", :green
-				shell.say_status :cmd, "curl http://backbonejs.org/backbonejs-min.js -o public/backbone.min.js", :blue
-				system("curl -silent http://backbonejs.org/backbone-min.js -o public/backbone.min.js")
-			end
-		end
-	end
-end

data/lib/appmake/installers/bootstrap.rb

@@ -1,24 +0,0 @@
-require "thor"
-
-module Appmake
-	module Installers
-		class Bootstrap
-			include Thor::Shell
-
-			def self.install
-				shell = Color.new
-
-				shell.say_status :install, "Bootstrap", :green
-				shell.say_status :cmd, "curl http://twitter.github.com/bootstrap/assets/bootstrap.zip -o public/bootstrap.zip", :blue
-				shell.say_status :cmd, "cd public", :blue
-				shell.say_status :cmd, "unzip bootstrap.zip &> /dev/null", :blue
-				shell.say_status :cmd, "mv bootstrap/js/bootstrap.min.js js/", :blue
-				shell.say_status :cmd, "mv bootstrap/css/bootstrap.min.css css/", :blue
-				shell.say_status :cmd, "mv bootstrap/css/bootstrap-responsive.min.css css/", :blue
-				shell.say_status :cmd, "mv bootstrap/img/* img/", :blue
-				shell.say_status :cmd, "rm -rf bootstrap && rm bootstrap.zip", :blue
-				system("curl -silent http://twitter.github.com/bootstrap/assets/bootstrap.zip -o public/bootstrap.zip && cd public && unzip bootstrap.zip &> /dev/null && mv bootstrap/js/bootstrap.min.js js/ && mv bootstrap/css/bootstrap.min.css css/ && mv bootstrap/css/bootstrap-responsive.min.css css/ && mv bootstrap/img/* img/ && rm -rf bootstrap && rm bootstrap.zip")
-			end
-		end
-	end
-end

data/lib/appmake/installers/jquery.rb

@@ -1,17 +0,0 @@
-require "thor"
-
-module Appmake
-	module Installers
-		class Jquery
-			include Thor::Shell
-
-			def self.install
-				shell = Color.new
-
-				shell.say_status :install, "jQuery", :green
-				shell.say_status :cmd, "curl http://code.jquery.com/jquery-1.9.0.min.js -o public/js/jquery.min.js", :blue
-				system("curl -silent http://code.jquery.com/jquery.min.js -o public/js/jquery.min.js")
-			end
-		end
-	end
-end

data/lib/appmake/installers/underscore.rb

@@ -1,17 +0,0 @@
-require "thor"
-
-module Appmake
-	module Installers
-		class Underscore
-			include Thor::Shell
-
-			def self.install
-				shell = Color.new
-
-				shell.say_status :install, "Underscore", :green
-				shell.say_status :cmd, "curl http://underscorejs.org/underscore-min.js -o public/underscore.min.js", :blue
-				system("curl -silent http://underscorejs.org/underscore-min.js -o public/underscore.min.js")
-			end
-		end
-	end
-end

data/lib/appmake/listeners/coffee.rb

@@ -1,38 +0,0 @@
-require "listen"
-
-module Appmake
-	module Listeners
-		class Coffee
-			include Thor::Shell
-
-			def self.listen(block = true)
-				callback = Proc.new do |modified, added, removed|
-					self.compile()
-				end
-
-				listener = Listen.to "coffee", :filter => /\.coffee$/
-				listener.change(&callback)
-				listener.start(block)
-			end
-
-			def self.compile
-				shell = Color.new
-
-				shell.say_status :compile, "CoffeScript", :green
-				
-				Dir.glob "coffee/*.coffee" do |f|
-					name = f.split("/").last
-					new_name = name.gsub "coffee", "js"
-
-					shell.say_status :cmd, "./node_modules/.bin/coffee -c coffee/#{name} && mv coffee/#{new_name} js/#{new_name}", :blue
-					system "./node_modules/.bin/coffee -c coffee/#{name} > /dev/null && mv coffee/#{new_name} js/#{new_name} > /dev/null"
-
-					if name[0] == name[0].upcase
-						shell.say_status :cmd, "./node_modules/.bin/webmake js/#{new_name} public/js/#{new_name}", :blue
-						system "./node_modules/.bin/webmake js/#{new_name} public/js/#{new_name} > /dev/null"
-					end
-				end
-			end
-		end
-	end
-end

data/lib/appmake/listeners/css.rb

@@ -1,36 +0,0 @@
-require "listen"
-require "thor"
-
-module Appmake
-	module Listeners
-		class Css
-			include Thor::Shell
-
-			def self.listen(block = true)
-				callback = Proc.new do |modified, added, removed|
-					self.compile()
-				end
-
-				listener = Listen.to "css", :filter => /\.scss$/
-				listener.change(&callback)
-				listener.start(block)
-			end
-
-			def self.compile
-				shell = Color.new
-
-				shell.say_status :compile, "CSS", :green
-				
-				Dir.glob "css/*" do |f|
-					name = f.split("/").last
-
-					if name[0] == name[0].upcase
-						new_name = name.gsub "scss", "css"
-						shell.say_status :cmd, "bundle exec sass css/#{name} public/css/#{new_name}", :blue
-						system "bundle exec sass css/#{name} public/css/#{new_name} > /dev/null"
-					end
-				end
-			end
-		end
-	end
-end

data/lib/appmake/listeners/js.rb

@@ -1,34 +0,0 @@
-require "listen"
-
-module Appmake
-	module Listeners
-		class Js
-			include Thor::Shell
-
-			def self.listen(block = true)
-				callback = Proc.new do |modified, added, removed|
-					self.compile()
-				end
-
-				listener = Listen.to "js", :filter => /\.js$/
-				listener.change(&callback)
-				listener.start(block)
-			end
-
-			def self.compile
-				shell = Color.new
-
-				shell.say_status :compile, "JavaScript", :green
-				
-				Dir.glob "js/*.js" do |f|
-					name = f.split("/").last
-
-					if name[0] == name[0].upcase
-						shell.say_status :cmd, "./node_modules/.bin/webmake js/#{name} public/js/#{name}", :blue
-						system "./node_modules/.bin/webmake js/#{name} public/js/#{name} > /dev/null"
-					end
-				end
-			end
-		end
-	end
-end

data/lib/appmake/listeners/tpl.rb

@@ -1,28 +0,0 @@
-require "listen"
-
-module Appmake
-	module Listeners
-		class Tpl
-			include Thor::Shell
-
-			def self.listen(block = true)
-				callback = Proc.new do |modified, added, removed|
-					self.compile()
-				end
-
-				listener = Listen.to "tpl", :filter => /\.html$/
-				listener.change(&callback)
-				listener.start(block)
-			end
-
-			def self.compile
-				shell = Color.new
-				
-				shell.say_status :compile, "Templates", :green
-				
-				shell.say_status :cmd, "./node_modules/.bin/dot-module -d tpl/ -o js/templates.js", :blue
-				system("./node_modules/.bin/dot-module -d tpl/ -o js/templates.js > /dev/null")
-			end
-		end
-	end
-end