convey 0.1 → 0.2

data/bin/convey

@@ -26,11 +26,13 @@ if command == "-v" or command == "version"
   puts "Convey #{Convey::VERSION}"
 elsif command == "init" or command == "-i"
   template_path = File.expand_path "#{File.dirname(__FILE__)}/../template"
-  `mkdir #{options[0]}`
+  `mkdir #{options[0] || 'my_site'}`
   `cp -R #{template_path}/* #{options[0]}`
-elsif command == "server" or command == "-s"
+elsif command == "server" or command == "-s" or command.nil?
   Convey::Server.run!
 elsif command == "compile" or command == "-c"
   dir = options[0] || Dir.pwd
   Convey::Compiler.compile!(dir)
+else
+  puts "See `convey help` for more infomation."
 end

data/lib/convey/compiler.rb

@@ -1,7 +1,7 @@
 module Convey
   class Compiler
     include Convey
-    
+
     def self.compile!(base_path)
       `rm -rf #{base_path}/compiled`
       Dir.mkdir("#{base_path}/compiled")
@@ -17,7 +17,7 @@ module Convey
         end
 
         meta = Convey::Compiler.process_file(path)
-        local_path = meta[:path].gsub(base_path, "") 
+        local_path = meta[:path].gsub(base_path, "")
 
         if meta[:path] != path
           puts "Compiled #{path.gsub(base_path, "")} to /compiled#{local_path}"
@@ -28,7 +28,7 @@ module Convey
         File.open("#{root}#{local_path}", 'w') {|f| f.write(meta[:data]) }
       end
     end
-    
+
     def self.process_file(path)
       meta = {}
       if File.exists?(path)
@@ -54,9 +54,9 @@ module Convey
       else
         raise "Path '#{path}' doesn't exist."
       end
-      
+
       return meta
     end
-    
+
   end
 end

data/lib/convey/main.rb

@@ -1,14 +1,14 @@
 module Convey
-  VERSION = "0.1"
-  
-  def coffee_installed?    
+  VERSION = "0.2"
+
+  def coffee_installed?
     begin
       `coffee -v`
     rescue
       return false
     end
-    
+
     return true
   end
-  
+
 end

data/lib/convey/server.rb

@@ -3,22 +3,26 @@ require 'sinatra/base'
 module Convey
   class Server < Sinatra::Base
     include Convey
-    
-    set :public, Dir.pwd
-    
-    get '/|*.html|css|js' do
+
+    set :public_folder, Dir.pwd
+
+    get "/hello" do
+      "hey!"
+    end
+
+    get '/*' do
       if env["PATH_INFO"] == '/'
         env["PATH_INFO"] = '/index.html'
       end
-    
+
       path = Dir.pwd + env["PATH_INFO"]
       path.gsub!(".html", ".haml")
       path.gsub!(".css", ".sass")
       path.gsub!(".js", ".coffee")
-    
+
       meta = Convey::Compiler.process_file(path)
       content_type "text/#{meta[:type]}"
       return meta[:data]
-    end 
+    end
   end
-end
+end

metadata

@@ -1,59 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: convey
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: '0.2'
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
 platform: ruby
-authors: 
+authors:
 - Ashley Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-31 00:00:00 +01:00
-default_executable: convey
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2011-10-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-- !ruby/object:Gem::Dependency 
+  requirement: &70308648349260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
   prerelease: false
+  version_requirements: *70308648349260
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &70308648348760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70308648348760
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70308648348180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: haml
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70308648348180
 description: 
-email: 
-executables: 
+email: hi@ashleyw.co.uk
+executables:
 - convey
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/convey
 - lib/convey/compiler.rb
 - lib/convey/main.rb
@@ -66,39 +63,28 @@ files:
 - LICENSE
 - NOTICE
 - README.md
-has_rdoc: true
 homepage: http://ashleyw.co.uk/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
-summary: "Convey: Haml, Sass and CoffeeScript prototyping"
+summary: ! 'Convey: Simple Haml, Sass and CoffeeScript prototyping'
 test_files: []
-