ki 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/ki

@@ -3,4 +3,4 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli'
 
-Cli.start
+Ki::Cli.start

data/examples/base/Gemfile

@@ -1,3 +1,5 @@
+source :rubygems
+
 gem 'ki'
 
 group :development do

data/examples/example/Gemfile

@@ -1,2 +1,2 @@
-gem 'ki'
+gem 'ki', :path => '../../'
 gem 'shotgun'

data/examples/example/app.rb

@@ -2,7 +2,7 @@ require 'ki'
 
 class Phone < Ki::Model
   forbid :delete
-  requires :foo, :bar
+  requires :number, :user_id
 end
 
 class User < Ki::Model
@@ -13,7 +13,3 @@ class User < Ki::Model
     @req.params[:password] = 'hashed password'
   end
 end
-
-class Post < Ki::Model
-  requires :text
-end

data/lib/cli.rb

@@ -1,43 +1,51 @@
 require 'thor'
 require 'thor/group'
 
-class AppGenerator < Thor::Group
-  include Thor::Actions
+module Ki
+  class AppGenerator < Thor::Group
+    include Thor::Actions
 
-  argument :app_name
+    argument :app_name
 
-  def self.source_root
-    File.join(File.dirname(__FILE__), '..', 'examples', 'base')
-  end
+    def self.source_root
+      File.join(File.dirname(__FILE__), '..', 'examples', 'base')
+    end
 
-  def dest_root
-    File.join(Dir.pwd, app_name)
-  end
+    def dest_root
+      File.join(Dir.pwd, app_name)
+    end
 
-  def prepare_dir
-    if Dir.exists? dest_root 
-      unless yes? "#{app_name} already exists. Do you want to overwrite it?"
-        say 'aborted'
-        exit 1
+    def prepare_dir
+      if Dir.exists? dest_root
+        unless yes? "#{app_name} already exists. Do you want to overwrite it?"
+          say 'aborted'
+          exit 1
+        end
+      else
+        Dir.mkdir dest_root
       end
-    else
-      Dir.mkdir dest_root
     end
-  end
 
-  def create_app
-    copy_file "Gemfile", "#{app_name}/Gemfile"
-    copy_file "config.ru", "#{app_name}/config.ru"
-    copy_file "config.yml", "#{app_name}/config.yml"
-    copy_file "app.rb", "#{app_name}/app.rb"
+    def create_app
+      copy_file "Gemfile", "#{app_name}/Gemfile"
+      copy_file "config.ru", "#{app_name}/config.ru"
+      copy_file "config.yml", "#{app_name}/config.yml"
+      copy_file "app.rb", "#{app_name}/app.rb"
+    end
   end
-end
-
-class Cli < Thor
-  register AppGenerator, :new, 'new', 'generate a new app'
 
-  desc 'hello [NAME]', 'says hello'
-  def hello(name)
-    say "Hello #{name}"
+  class Cli < Thor
+    register AppGenerator, :new, 'new [APP_NAME]', 'generate a new app'
+
+    desc 'server', 'starts the app'
+    method_option :reload, :type => :boolean, :aliases => "-r", :desc => 'Recommended for development'
+    def server
+      if options[:reload]
+        say 'Starting with Shotgun', :green
+        system 'bundle exec shotgun'
+      else
+        system 'thin start'
+      end
+    end
   end
 end

data/lib/ki.rb

@@ -16,11 +16,9 @@ module Ki
   class Ki
     def self.new
       Rack::Builder.new do
-        static_path = File.join(Ki.root, 'lib/public/*')
-        static_files = Dir.glob(static_path).collect{|c| File.basename(c)}
-        static_files.each do |sf|
-          map "/public/#{sf}" do
-            run Rack::File.new(Util::public_dir(sf))
+        Util.static_files.each do |sf|
+          map "/public/#{File.basename(sf)}" do
+            run Rack::File.new(sf)
           end
         end
 

data/lib/util.rb

@@ -13,12 +13,11 @@ end
 
 module Ki
   class Util
-    def self.public_dir name
-      custom = File.join(Dir.pwd, 'public', name)
-      unless File.exists? custom
-        custom = File.join(Ki.root, 'lib', 'public', name)
-      end
-      custom
+    # the order in which files are loaded is important
+    def self.static_files
+      static_files = Dir.glob(File.join(Ki.root, 'lib/public/*'))
+      static_files << Dir.glob(File.join(Dir.pwd, 'public/*'))
+      static_files.flatten!
     end
 
     def self.partial s, hash={}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -240,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4484784493879915658
+      hash: 2106213773731717633
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: