tyrone 0.4.1 → 0.9.0

data/.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+pkg
+*.gemspec

data/README.md

@@ -1,48 +1,63 @@
 ![tyrone](http://cloud.github.com/downloads/chrislloyd/tyrone/logo.png)
 
-<small>a rapid prototyping fix. tyrone be great with uis. he loves em so much and will care the shit out of them. my boy tyrone is definitely the right man for the job, i aint playin. by [chris](http://chrislloyd.com.au).</small>
+<small>a rapid prototyping fix. tyrone be great with uis. he loves em so much and will care the shit out of them. my boy tyrone is definitely the right man for the job, i aint playin. by [the poacher](http://thelincolnshirepoacher.com).</small>
 
 It's always better to work from the UI down. Nobody cares about what database you are using or if you have 100% test coverage if the app itself _sucks_. Tyrone likes UIs. Like his community boxing gym, he likes to encourage good practices right from the start. He helps you get up and running prototyping UIs as quickly as possible so you can't procrastinate solving the real problems in your app.
 
-(For more information about Tyrone's intentions, please read the [associated article](http://chrislloyd.com.au/post/154530835/databases-are-for-pussies))
+(For more information about Tyrone's intentions, please read the [associated article](http://thelincolnshirepoacher.com/pages/databases-are-for-pussies))
 
 ![screenshot](http://cloud.github.com/downloads/chrislloyd/tyrone/tyrone-0.1.0.png)
 
 
 ## Installing
 
-    {gem,rip} install tyrone
+    gem install tyrone
 
-Then, to get Tyrone started on your job:
+Then, to get Tyrone started on your jobs directory:
 
-    tyrone [NAME OF JOB]
+    tyrone init
 
-Bada bing!
+Bada bing! To make a new mockup a convenience helper is
 
-If you want the `states.js` or the `grid.js` you can do so like this:
+    tyrone mock "my awesome new feature"
 
-    tyrone [NAME OF JOB] --states --grid
+## Running
 
-## Features
+    rake dev
+
+Then open up [http://localhost:4567](http://localhost:4567)
 
-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:
+## Philosophy
 
-    set :haml => {:format => :xhtml}
+  * **Undefined scope is bad**. So define it quickly.
+  * **Mockups are not apps**. They shouldn't have tests. They shouldn't support IE.
+  * **Sensible Power**. Good defaults for dev but power when you need it.
+
+## Features
 
-Remember, it's just a Sinatra app so everything you can do in Sinatra you can do in Tyrone. However, you should note that the default behaviour of Sinatra is to process Sass files in the 'views' directory (or 'mockups' in Tyrone). Tyrone doesn't think that sytles are "views" so you can place your Sass files in 'public/css' and they'll get processed automagically. Word.
+Tyrone believes in tough love. You're going to have to do a lot of work yourself. However, he does want to give the pups a head-start. Your job uses HTML 5 and comes with a HTML 5 `reset.css`.
 
-Straight out of compton, Tyrone be givin' u some crunk prototyping scripts.
+Straight out of compton, Tyrone be givin' u some crunk prototyping j-shizzle.
 
-  1. [states.js](http://github.com/toolmantim/states.js) &mdash; [t-star](http://toolmantim.com)'s script lets you hide and show bits of your UI so you can simulate state. For example hide and show a logged in user's account controls. Think [Polypage](http://github.com/andykent/polypage) on a diet.
-  2. [grid.js](http://gist.github.com/160497) &mdash; A handy tool which overlays vertical and horizontal grids when SHIFT-v or SHIFT-h are pressed. By default it is applied to `body` but you can change this in `application.js`. Big ups [byrne-diddy](http://myles.id.au).
+  1. [states.js](http://github.com/toolmantim/states.js) &mdash; [t-star](http://toolmantim.com)'s script lets you hide and show bits of your UI so you can simulate state. For example toggle a user's account controls. Think [Polypage](http://github.com/andykent/polypage) on a diet.
+  2. [jquery.grid.js](http://github.com/quackingduck/jquery.grid.js) &mdash; A handy tool which overlays vertical and horizontal grids when SHIFT-v or SHIFT-h are pressed. You'll have to initialise it yourself, though. Big ups [byrne-diddy](http://myles.id.au).
 
-Some mockup helpers are:
+What choo get is just a [Sinatra](http://sinatrarb.com) app, so everything you can do in Sinatra you can do in Tyrone. Rather than the views directory, you now have `mockups`.
+
+Some helpers are:
 
   * `hidden` &mdash; Just returns `{:style => 'display:none'}` so you can quickly hide elements. Useful when doing JS hiding and showing.
   * `mockup_path(mockup)` &mdash; Returns a URL to another mockup.
 
-The `features` directory is where you start placing your user stories. The prototyping phase is a great time to start writing them.
+To run the local server just type `rake dev`. If you then go to [localhost:4567](http://localhost:4567) you should be redirected to the '/mockups' page. This will show you an index of all the mockups you have. Often you want prototypes to behave like real apps so to set the root page just override it in your `app.rb`:
+
+    get '/' do
+      haml :my_index
+    end
+
+The `features` directory is where you start placing your user stories. The prototyping phase is a great time to start writing them, but don't feel like you need to implement them.
 
+All of tyrone's jobs come with [Bundler](http://github.com/carlhuda/bundler) built in and are ready to get up and running on [Heroku](http://heroku.com) with a simple `heroku create`.
 
 ## Associates
 

data/Rakefile

@@ -1,11 +1,23 @@
-require 'mg'
-require 'lib/tyrone'
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = 'tyrone'
+    gem.summary = 'care the shit out of your ui'
+    gem.homepage = 'http://github.com/chrislloyd/tyrone'
 
-mg = MG.new('tyrone.gemspec')
+    gem.author = 'Chris Lloyd'
+    gem.email = 'christopher.lloyd@gmail.com'
 
-tyrone_version = Tyrone.version
-gemspec_version = mg.spec.version.to_s
+    gem.rubyforge_project = gem.name
+    gem.executable = gem.name
+    gem.has_rdoc = false
 
-unless tyrone_version == gemspec_version
-  raise "Version mismatch: #{tyrone_version} (Tyrone) - #{gemspec_version} (gemspec)"
+    gem.add_dependency 'thor', '>= 0.13.0'
+    gem.add_dependency 'sinatra', '>= 1.0'
+    gem.add_dependency 'haml', '>= 2.2.0'
+    gem.add_dependency 'bundler', '>= 0.9.0'
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/VERSION

@@ -0,0 +1 @@
+0.9.0

data/bin/tyrone

@@ -1,38 +1,3 @@
 #!/usr/bin/env ruby
-require 'rubygems'
 require 'tyrone'
-
-gem 'pixii', '>= 0.1.6'
-require 'pixii'
-
-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://gist.github.com/159037.txt', 'public/css/reset.sass'
-
-  make.template 'sinatra.rb.erb', "#{opts.project}.rb"
-  make.template 'config.ru.erb', 'config.ru'
-  make.template 'application.js.erb', 'public/js/application.js'
-  make.template 'layout.haml.erb', 'mockups/layout.haml'
-
-  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
+Tyrone::Cli.start

data/lib/tyrone/app.rb

@@ -1,4 +1,9 @@
-set :haml => {:format => :html5}
+configure do
+  set :app_file => 'app.rb'
+  set :views => 'mockups'
+  set :haml => {:format => :html5}
+  enable :inline_templates
+end
 
 helpers do
   def mockup_path(mockup)
@@ -6,34 +11,38 @@ helpers do
   end
 end
 
+# Please override me
 get '/' do
-  use_in_file_templates!
-  @mockups = Dir.glob(File.join(options.views, '*.haml')).map do |mockup|
-    File.basename(mockup,'.*').gsub('_',' ')
-  end.reject {|file| file == 'layout'}
-  haml :index, :layout => false
+  redirect '/mockups'
+end
+
+get '/mockups/?' do
+  @mockups = Dir.glob(File.join(options.views, '*.haml')).
+    reject {|f| f == 'mockups/layout.haml'}.
+    sort_by {|f| File.mtime(f)}.reverse.
+    map {|f| File.basename(f,'.haml').gsub('_',' ')}
+
+  haml :tyrone_index, :layout => false
 end
 
-get '/mockups/:mockup' do |mockup|
+get '/mockups/:mockup/?' do |mockup|
   haml mockup.to_sym
 end
 
 __END__
-
-@@index
+@@tyrone_index
 !!!
 %html
   %head
     %title mockups
     %style{:type => 'text/css', :media => 'screen'}
       :sass
-
         *
           :margin 0
           :padding 0
         body
           :margin 40px
-          :font-family Helvetica, sans-serif
+          :font-family Helvetica, Arial, sans-serif
         h1
           :font-size 24px
           :line-height 40px
@@ -51,6 +60,10 @@ __END__
             :color #333
             &:hover
               :border-bottom 1px solid #333
+          small
+            color: #CCC
+            text-transform: uppercase
+            font-size: 10px
         .footer
           :font-size 11px
           :line-height 20px
@@ -62,7 +75,7 @@ __END__
     %h1 Mockups
     %ul
       - if @mockups.empty?
-        there are no mockups yet. add one to <code>#{File.expand_path(options.views)}</code>.
+        There are no mockups yet. Add one to <code>#{File.expand_path(options.views)}</code>.
       - @mockups.each do |mockup|
         %li
           %a{:href => mockup_path(mockup)}= mockup

data/lib/tyrone/cli.rb

@@ -0,0 +1,41 @@
+require 'thor'
+
+class Tyrone::Cli < Thor
+  include Thor::Actions
+
+  source_paths << Tyrone.templates
+
+  desc 'init', 'creates a new tyrone project in the current directory'
+  def init
+    @project = Pathname.pwd.basename
+
+    copy_file 'Rakefile', 'Rakefile'
+    copy_file 'Gemfile', 'Gemfile'
+    copy_file 'config.ru'
+    copy_file 'init.rb'
+    copy_file 'app.rb', 'app.rb'
+
+    empty_directory 'mockups'
+
+    empty_directory 'public'
+    template 'layout.haml.erb', 'mockups/layout.haml'
+
+    empty_directory 'public/css'
+    get 'http://html5resetcss.googlecode.com/files/html5reset-1.4.1.css', 'public/css/reset.css'
+
+    empty_directory 'public/js'
+    get 'http://github.com/toolmantim/states.js/raw/master/states.js', 'public/js/jquery.states.js'
+    get 'http://github.com/quackingduck/jquery.grid.js/raw/master/jquery.grid.js', 'public/js/jquery.grid.js'
+
+    empty_directory 'features'
+
+    system 'bundle install'
+  end
+
+  desc 'mock NAME', 'creates a new mock'
+  def mock(name)
+    empty_directory 'mockups'
+    create_file "mockups/#{name.gsub(' ','-')}.haml"
+  end
+
+end

data/lib/tyrone.rb

@@ -1,11 +1,19 @@
+require 'pathname'
+
 module Tyrone
   extend self
 
+  def root
+    Pathname(__FILE__).dirname.join('..')
+  end
+
   def version
-    '0.4.1'
+    root.join('VERSION').read.freeze
   end
 
   def templates
-    File.join(File.dirname(__FILE__),'..','templates')
+    root.join('templates')
   end
 end
+
+require 'tyrone/cli'

data/templates/Gemfile

@@ -0,0 +1,10 @@
+source :gemcutter
+
+gem 'sinatra'
+gem 'haml'
+gem 'tyrone'
+
+group :development do
+  gem 'shotgun'
+  gem 'thin'
+end

data/templates/Rakefile

@@ -0,0 +1,4 @@
+desc 'Runs the development server'
+task :dev do
+  exec 'bundle exec shotgun --require init --server thin --host 127.0.0.1 --port 4567 app.rb'
+end

data/templates/app.rb

@@ -0,0 +1,7 @@
+# Tyrone cares the shit out of you
+
+helpers do
+  def hidden
+    {:style => 'display:none'}
+  end
+end

data/templates/config.ru

@@ -0,0 +1,2 @@
+require 'app'
+run Sinatra::Application

data/templates/init.rb

@@ -0,0 +1,9 @@
+begin
+  require File.join(File.dirname(__FILE__), '.bundle', 'environment')
+rescue LoadError
+  require 'bundler'
+  Bundler.setup
+end
+
+Bundler.require
+require 'tyrone/app'

data/templates/layout.haml.erb

@@ -2,16 +2,11 @@
 %html
   %head
     %meta{:charset => 'utf-8'}
-    %title <%= project %>
+    %title <%= @project %>
     %link{:rel => 'stylesheet', :type => 'text/css', :href => '/css/reset.css'}
-    
-    %script{:src => '/js/jquery.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 %>
+    %script{:src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js', :type => 'text/javascript'}
+
+    %script{:src => '/js/jquery.states.js', :type => 'text/javascript'}
+    %script{:src => '/js/jquery.grid.js', :type => 'text/javascript'}
   %body
     = yield

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tyrone
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Chris Lloyd
@@ -9,86 +14,115 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-22 00:00:00 +10:00
-default_executable: 
+date: 2010-03-27 00:00:00 +11:00
+default_executable: tyrone
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: thor
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 13
+        - 0
+        version: 0.13.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: pixii
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.6
-    version: 
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :runtime
+  version_requirements: *id004
 description: 
 email: christopher.lloyd@gmail.com
 executables: 
 - tyrone
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.md
 files: 
-- deps.rip
-- Rakefile
+- .gitignore
 - README.md
+- Rakefile
+- VERSION
+- bin/tyrone
 - lib/tyrone.rb
 - lib/tyrone/app.rb
-- bin/tyrone
-- templates/application.js.erb
-- templates/config.ru.erb
-- templates/dot.gems.erb
-- templates/h_grid.gif
+- lib/tyrone/cli.rb
+- logo.png
+- templates/Gemfile
+- templates/Rakefile
+- templates/app.rb
+- templates/config.ru
+- templates/init.rb
 - templates/layout.haml.erb
-- templates/sinatra.rb.erb
-- templates/v_grid.gif
 has_rdoc: true
 homepage: http://github.com/chrislloyd/tyrone
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: tyrone
-rubygems_version: 1.3.4
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: care the shit out of your ui

data/deps.rip

@@ -1,3 +0,0 @@
-git://github.com/sinatra/sinatra.git 0.9.4
-git://github.com/nex3/haml.git 2.2.2
-git://github.com/chrislloyd/pixii 0.1.6

data/templates/application.js.erb

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

data/templates/config.ru.erb

@@ -1,22 +0,0 @@
-__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__,
-    :views => File.join(__DIR__, 'mockups'),
-    :public => File.join(__DIR__, 'public'),
-    :app_file => '<%= project %>.rb'
-
-require '<%= project %>'
-
-run Sinatra::Application

data/templates/dot.gems.erb

@@ -1,3 +0,0 @@
-haml --version=2.2.2
-sinatra --version=0.9.4
-tyrone --version=<%= version %>

data/templates/sinatra.rb.erb

@@ -1,14 +0,0 @@
-# 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