tyrone 0.3.0 → 0.3.2

data/bin/tyrone

@@ -1,22 +1,11 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+require 'tyrone'
 
-gem 'pixii', '>= 0.1.4'
+gem 'pixii', '>= 0.1.6'
 require 'pixii'
 
-# Loads the gemspec under Github like condtions.
-# Shamelessly stolen from sr/mg.
-def gemspec
-  @spec ||= begin
-    require 'rubygems/specification'
-    data = File.read File.join(File.dirname(__FILE__), '..', 'tyrone.gemspec')
-    spec = nil
-    Thread.new { spec = eval("$SAFE = 3\n#{data}")}.join
-    spec
-  end
-end
-
-Pixii.called(:tyrone, :version => gemspec.version) do |make, opts|
+Pixii.called(:tyrone, :version => Tyrone.version, :templates => Tyrone.templates) 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'
@@ -24,13 +13,15 @@ Pixii.called(:tyrone, :version => gemspec.version) do |make, opts|
   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 '../templates/h_grid.gif', 'public/images/h_grid.gif'
-  make.clone '../templates/v_grid.gif', 'public/images/v_grid.gif'
+  make.clone 'h_grid.gif', 'public/images/h_grid.gif'
+  make.clone 'v_grid.gif', 'public/images/v_grid.gif'
 
   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'
+
   make.magic!
 end

data/deps.rip

@@ -1,3 +1,3 @@
 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.4
+git://github.com/chrislloyd/pixii 0.1.6

data/lib/tyrone/app.rb

@@ -0,0 +1,87 @@
+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
+  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
+end
+
+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
+!!!
+%html
+  %head
+    %title mockups
+    %style{:type => 'text/css', :media => 'screen'}
+      :sass
+
+        *
+          :margin 0
+          :padding 0
+        body
+          :margin 40px
+          :font-family Helvetica, sans-serif
+        h1
+          :font-size 24px
+          :line-height 40px
+          :margin-bottom 20px
+          :text-transform lowercase
+        ul
+          :color #CCC
+          :font-size 12px
+          :line-height 20px
+          :font-size 14px
+          :line-height 20px
+          :color #999
+          a
+            :text-decoration none
+            :color #333
+            &:hover
+              :border-bottom 1px solid #333
+        .footer
+          :font-size 11px
+          :line-height 20px
+          :margin-top 60px
+          :color #CCC
+          :display block
+          :text-decoration none
+  %body
+    %h1 Mockups
+    %ul
+      - if @mockups.empty?
+        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
+    %a.footer{:href => 'http://github.com/chrislloyd/tyrone'} tyrone luvs ya.

data/lib/tyrone.rb

@@ -1,87 +1,12 @@
-gem 'haml', '2.2.2'; require 'haml'; require 'sass'
+module Tyrone
+  extend self
 
-set :haml => {:format => :html5}
-
-helpers do
-  def mockup_path(mockup)
-    "/mockups/#{mockup.to_s.gsub(' ','_')}"
-  end
-  def hidden
-    {:style => 'display:none'}
+  def version
+    '0.3.2'
   end
-end
-
-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
-end
-
-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
+  def templates
+    File.join(File.dirname(__FILE__),'..','templates')
+  end
 
-get /\.sass$/ do
-  pass
 end
-
-__END__
-
-@@index
-!!!
-%html
-  %head
-    %title mockups
-    %style{:type => 'text/css', :media => 'screen'}
-      :sass
-
-        *
-          :margin 0
-          :padding 0
-        body
-          :margin 40px
-          :font-family Helvetica, sans-serif
-        h1
-          :font-size 24px
-          :line-height 40px
-          :margin-bottom 20px
-          :text-transform lowercase
-        ul
-          :color #CCC
-          :font-size 12px
-          :line-height 20px
-          :font-size 14px
-          :line-height 20px
-          :color #999
-          a
-            :text-decoration none
-            :color #333
-            &:hover
-              :border-bottom 1px solid #333
-        .footer
-          :font-size 11px
-          :line-height 20px
-          :margin-top 60px
-          :color #CCC
-          :display block
-          :text-decoration none
-  %body
-    %h1 Mockups
-    %ul
-      - if @mockups.empty?
-        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
-    %a.footer{:href => 'http://github.com/chrislloyd/tyrone'} tyrone luvs ya.

data/templates/application.js.erb

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

data/templates/dot.gems.erb

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

data/templates/layout.haml.erb

@@ -0,0 +1,14 @@
+!!!
+%html
+  %head
+    %meta{:charset => 'utf-8'}
+    %title <%= project %>
+    %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'}
+    %script{:src => '/js/application.js', :type => 'text/javascript'}
+    
+  %body
+    = yield

data/templates/sinatra.rb.erb

@@ -1,3 +1,3 @@
-# Tyrone - It'll care the shit out of you
+# Tyrone will care the shit out of you
 gem 'tyrone', '<%= version %>'
-require 'tyrone'
+require 'tyrone/app'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyrone
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors: 
 - Chris Lloyd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 +10:00
+date: 2009-08-10 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.4
+        version: 0.1.6
     version: 
 description: 
 email: christopher.lloyd@gmail.com
@@ -55,9 +55,15 @@ files:
 - Rakefile
 - README.md
 - 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
+- templates/layout.haml.erb
 - templates/sinatra.rb.erb
+- templates/v_grid.gif
 has_rdoc: true
 homepage: http://github.com/chrislloyd/tyrone
 licenses: []