soxer 0.9.6 → 0.9.6.1

data/CHANGES

@@ -1,3 +1,11 @@
+= 0.9.6.1 / 2010-11-01
+  
+  * Soxer binary cleanup
+
+  * Fixed empty skeleton for proper soxer inclusion
+  
+  * Fixed soxer binary for empty skeleton creation
+    
 = 0.9.6 / 2010-10-31
 
   * Forgot to include the streamlined empty skeleton for a modular style

data/bin/soxer

@@ -9,103 +9,101 @@ def h
 end
 
 def err message
-<<END
-#{h}
-#{b message}
-Type #{b 'soxer help'} to get help.
-
-Soxer usage:
-  #{b "soxer [action] [parameters]"}
+  <<-END.gsub /^\s\s/, ''
+  #{h}
+  #{b "ERROR: "+message}
+  Type #{b 'soxer help'} to get help.
   
-END
+  Soxer usage:
+    #{b "soxer [action] [parameters]"}
+    
+  END
 end
 
 def notice message
-<<END
-#{h}
-#{b message}
-
-END
+  <<-END.gsub /^\s\s/, ''
+  #{h}
+  #{b message}
+  
+  END
 end
 
-@help = <<END
-#{h}
-
-Soxer usage:
-  #{b "soxer [action] [parameters]"}
+def help 
+  <<-END.gsub /^\s\s/, ''
+  #{h}
   
-Actions:
-
-  #{b 'create'}
-    Creates a new soxer project directory with default sinatra/soxer layout.
-    All aspects can be later customized to suite project's needs.
+  Soxer usage:
+    #{b "soxer [action] [parameters]"}
     
-    First parameter:
-      #{b 'empty'}     - Creates an empty project
-      More project templates are in the making
+  Actions:
+  
+    #{b 'create'}
+      Creates a new soxer project directory with default sinatra/soxer layout.
+      All aspects can be later customized to suite project's needs.
       
-      Other parameters:
-        #{b '[name]'}  - The name of the project directory
+      First parameter:
+        #{b 'empty'}     - Creates an empty project
+        More project templates are in the making
+        
+        Other parameters:
+          #{b '[name]'}  - The name of the project directory
+        
+    #{b 'test'}
+      Runs the developement server (in the foreground) on your computer.
+      Point your browser to #{b 'http://localhost:9394'} to view the result.
+      You can exit with standard [ctrl]+c.
       
-  #{b 'test'}
-    Runs the developement server (in the foreground) on your computer.
-    Point your browser to #{b 'http://localhost:9394'} to view the result.
-    You can exit with standard [ctrl]+c.
-    
-    Parameters:
-      #{b '[int]'} - Port number you wish to run developement on
-    
-  #{b 'help'}
-    Displays this help.
-
-Examples:
-
-#{b '$ soxer create blog myblog'}
-  This command would create a new project directory 'myblog' with a mockup blog
-  soxer/sinatra application in it. You can tweak the design and parameters to
-  acheve the desired experience.
+      Parameters:
+        #{b '[int]'} - Port number you wish to run developement on
+      
+    #{b 'help'}
+      Displays this help.
   
-#{b '$ soxer test 8907'}
-  This command (when executed within the soxer project directory root) will
-  run the developement server on local machine on port 8907.
+  Examples:
   
-END
+  #{b '$ soxer create blog myblog'}
+    This command would create a new project directory 'myblog' with a mockup blog
+    soxer/sinatra application in it. You can tweak the design and parameters to
+    acheve the desired experience.
+    
+  #{b '$ soxer test 8907'}
+    This command (when executed within the soxer project directory root) will
+    run the developement server on local machine on port 8907.
+    
+  END
+end
 
-def create
-  template = $*[1]
-  # Define skeleton parent directory
+def create template, dir
   skel = File.dirname(__FILE__)+"/../lib/soxer/skel"
-  # Define destination or default
-  dir = $*[2] ? $*[2] : 'soxer-app'
-  # Copy skeleton to destination or fail if nonexistent
-  if template!=nil and File.exist?(skel+'/'+template) and !File.exist?(dir)
-    src = skel+'/'+template
-    # Check for destination existance
-    if !File.exist?(dir)
-      FileUtils.mkdir(dir)
-      FileUtils.cp_r(src+"/.", dir)
-      return notice "Successfuly created '"+dir+"' Directory."
+  case true
+    when template==nil then
+      return err "You did not enter the project type skeleton."
+    when dir==nil then
+      return err "You did not enter destination application directory."
+    when !File.exist?(skel+'/'+template) then
+      return err "The project skeleton directory does not exist."
+    when File.exist?(dir) then
+      return err "The destination directory exists."
     else
-      return err 'The destination directory exists.'
-    end
-  else
-    return err 'The project skeleton directory does not exist.'
+      FileUtils.mkdir(dir)
+      FileUtils.cp_r( Dir.glob( File.join(skel, template, '*') ), dir)
+      return notice "Successfuly created '#{dir}' application directory from '#{template}'."
   end
 end
 
-def test
-  port = $*[1]!=nil ? $*[1] : '9394'
+def test port
+  port = 9394 unless port!=nil
   server = 'webrick'
   ENV['PATH'].split(':').each {|folder| server = 'thin' if File.exists?(folder+'/thin')}
-  x = system("rackup -s #{server} -p #{port}")
+  system("rackup -s #{server} -p #{port}")
   return "Developement mode ends."
 end
 
 case $*[0]
-  when 'create' then printf create
-  when 'test' then printf test
+  when 'create' then printf create $*[1], $*[2]
+  when 'test' then printf test $*[1]
   when 'prank' then printf prank
-  when 'help' then printf @help
+  when 'help' then printf help
   else printf err 'You did not specify an action!'
 end
 

data/lib/soxer/skel/empty/app.rb

@@ -5,13 +5,5 @@ require "soxer"
 
 class SoxerApp < Sinatra::Base
   register Sinatra::Soxer
-  
-  # Only for sending forms... not a part of Soxer per se...
-  post '*/?' do
-    content_type "text/html", :charset => "utf-8"
-    page = get_page
-    page['layout'] ||= 'layout'
-    haml page['content'], :layout => page['layout'].to_sym, :locals => { :page => page }
-  end
 
 end

data/lib/soxer/skel/empty/config.ru

@@ -4,7 +4,6 @@ require "app"
 
 disable :run
 set :server, %w[thin mongrel webrick]
-set :origin, "content"
 set :haml, {:format => :html5, 
             :attr_wrapper => '"'}
 set :haml, {:encoding => 'utf-8'} if RUBY_VERSION=~/1\.9/
@@ -21,6 +20,6 @@ end
 
 set :environment, :production
 
-map '/'
+map '/' do
   run SoxerApp
 end

data/lib/soxer/skel/empty/content/index.yaml

@@ -1,6 +1,7 @@
 uuid: 151af640-c35a-012d-f6b7-001e378a2988
 date: 2010-10-26T20:03:43+02:00
-title: Congratulations!
+title: Hello world!
 content: |
   %h1= page['title']
+  %h2 Congratulations!
   %p You have just created your first #{link_to 'soxer', 'http://soxer.mutsu.org'} application.

data/soxer.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.7'
 
   s.name              = 'soxer'
-  s.version           = '0.9.6'
+  s.version           = '0.9.6.1'
   s.date              = '2010-11-01'
   s.rubyforge_project = 'soxer'
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: soxer
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 9
   - 6
-  version: 0.9.6
+  - 1
+  version: 0.9.6.1
 platform: ruby
 authors: 
 - Toni Anzlovar
@@ -83,7 +84,7 @@ files:
 - lib/soxer/skel/empty/config.yml
 - lib/soxer/skel/empty/config.ru
 - lib/soxer/skel/empty/views/layout.haml
-- lib/soxer/skel/empty/views/css.sass
+- lib/soxer/skel/empty/views/css/css.sass
 - lib/soxer/skel/empty/app.rb
 has_rdoc: true
 homepage: http://soxer.mutsu.org