tyrone 0.3.2 → 0.4.0

data/README.md

@@ -19,6 +19,10 @@ Then, to get Tyrone started on your job:
 
 Bada bing!
 
+If you want the `states.js` or the `grid.js` you can do so like this:
+
+    tyrone [NAME OF JOB] --states --grid
+
 ## Features
 
 Tyrone believes in tough love. You're going to have to do alot of work yourself. However, he does want to give the pups a headstart. Your job _will_ use HTML 5 and comes with a HTML 5 `reset.css`. It's the way of the future and will save you time (see `input[placeholder]`). If you really object you can turn HTML 5 off, just by placeing this line in your Sinatra file:
@@ -37,7 +41,7 @@ Some mockup helpers are:
   * `hidden` — Just returns `{:style => 'display:none'}` so you can quickly hide elements. Useful when doing JS hiding and showing.
   * `mockup_path(mockup)` — Returns a URL to another mockup.
 
-And that's all.
+The `features` directory is where you start placing your user stories. The prototyping phase is a great time to start writing them.
 
 
 ## Associates

data/bin/tyrone

@@ -5,16 +5,17 @@ require 'tyrone'
 gem 'pixii', '>= 0.1.6'
 require 'pixii'
 
-Pixii.called(:tyrone, :version => Tyrone.version, :templates => Tyrone.templates) do |make, opts|
+Pixii.called( :tyrone,
+              :version => Tyrone.version,
+              :templates => Tyrone.templates,
+              :grid => ARGV.include?('--grid'),
+              :states => ARGV.include?('--states')
+)do |make, opts|
   make.dir 'features', 'mockups', 'public', 'public/js', 'public/images', 'public/css'
 
   make.clone 'http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js', 'public/js/jquery.js'
-  make.clone 'http://github.com/toolmantim/states.js/raw/master/states.js', 'public/js/states.js'
-  make.clone 'http://gist.github.com/160497.txt', 'public/js/grid.js'
-  make.clone 'http://gist.github.com/159037.txt', 'public/css/reset.sass'
 
-  make.clone 'h_grid.gif', 'public/images/h_grid.gif'
-  make.clone 'v_grid.gif', 'public/images/v_grid.gif'
+  make.clone 'http://gist.github.com/159037.txt', 'public/css/reset.sass'
 
   make.template 'sinatra.rb.erb', "#{opts.project}.rb"
   make.template 'config.ru.erb', 'config.ru'
@@ -23,5 +24,15 @@ Pixii.called(:tyrone, :version => Tyrone.version, :templates => Tyrone.templates
 
   make.template 'dot.gems.erb', '.gems'
 
+  if opts.states
+    make.clone 'http://gist.github.com/160497.txt', 'public/js/grid.js'
+  end
+
+  if opts.grid
+    make.clone 'http://github.com/toolmantim/states.js/raw/master/states.js', 'public/js/states.js'
+    make.clone 'h_grid.gif', 'public/images/h_grid.gif'
+    make.clone 'v_grid.gif', 'public/images/v_grid.gif'
+  end
+
   make.magic!
 end

data/lib/tyrone/app.rb

@@ -1,14 +1,9 @@
-gem 'haml', '2.2.2'; require 'haml'; require 'sass'
-
 set :haml => {:format => :html5}
 
 helpers do
   def mockup_path(mockup)
     "/mockups/#{mockup.to_s.gsub(' ','_')}"
   end
-  def hidden
-    {:style => 'display:none'}
-  end
 end
 
 get '/' do
@@ -23,19 +18,6 @@ get '/mockups/:mockup' do |mockup|
   haml mockup.to_sym
 end
 
-# Sass doesn't belong in mockups, it belongs in public
-
-get /^\/css\/(.+)\.css$/ do |style_file|
-  sass_file = File.join('public','css',"#{style_file}.sass")
-  pass unless File.exist?(sass_file)
-  content_type :css
-  sass File.read(sass_file)
-end
-
-get /\.sass$/ do
-  pass
-end
-
 __END__
 
 @@index

data/lib/tyrone.rb

@@ -8,5 +8,4 @@ module Tyrone
   def templates
     File.join(File.dirname(__FILE__),'..','templates')
   end
-
 end

data/templates/application.js.erb

@@ -1,7 +1,7 @@
 (function($){
     $(function(){
 
-        $(document.body).grid();
+      // ...
 
     });
 })(jQuery);

data/templates/config.ru.erb

@@ -1,7 +1,15 @@
-require 'sinatra'
-
 __DIR__ = File.dirname(__FILE__)
 
+File.file?(gems_file = File.join(__DIR__,'.gems')) && File.read(gems_file).each do |gem_decl|
+  gem_name, version = gem_decl[/^([^\s]+)/,1], gem_decl[/--version ([^\s]+)/,1]
+  version ? gem(gem_name, version) : gem(gem_name)
+end
+
+require 'sinatra'
+require 'haml'
+require 'sass'
+require 'tyrone/app'
+
 set :run => false,
     :environment => :development,
     :root => __DIR__,
@@ -9,6 +17,6 @@ set :run => false,
     :public => File.join(__DIR__, 'public'),
     :app_file => '<%= project %>.rb'
 
-require '<%= project %>.rb'
+require '<%= project %>'
 
 run Sinatra::Application

data/templates/layout.haml.erb

@@ -6,9 +6,12 @@
     %link{:rel => 'stylesheet', :type => 'text/css', :href => '/css/reset.css'}
     
     %script{:src => '/js/jquery.js', :type => 'text/javascript'}
-    %script{:src => '/js/states.js', :type => 'text/javascript'}
-    %script{:src => '/js/grid.js', :type => 'text/javascript'}
+<% if states %>    %script{:src => '/js/states.js', :type => 'text/javascript'}<% end %>
     %script{:src => '/js/application.js', :type => 'text/javascript'}
-    
+<% if grid %>    - if options.environment == :development
+      %script{:src => '/js/grid.js', :type => 'text/javascript'}
+      :javascript
+        $(document).ready(function(){ $(document.body).grid(); });
+      <% end %>
   %body
     = yield

data/templates/sinatra.rb.erb

@@ -1,3 +1,14 @@
-# Tyrone will care the shit out of you
-gem 'tyrone', '<%= version %>'
-require 'tyrone/app'
+# Tyrone cares the shit out of you
+
+helpers do
+  def hidden
+    {:style => 'display:none'}
+  end
+end
+
+get /^\/css\/(.+)\.css$/ do |style_file|
+  sass_file = File.join('public','css',"#{style_file}.sass")
+  pass unless File.exist?(sass_file)
+  content_type :css
+  sass File.read(sass_file)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyrone
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Chris Lloyd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 +10:00
+date: 2009-08-22 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency