beds 0.1.2 → 1.0.1

data/bin/beds

@@ -4,12 +4,12 @@ require "#{File.dirname(__FILE__)}/../lib/cli.rb"
 
 ## A bit of magic to call Beds::CLI::<CLI-Command>
 cmd = ARGV[0].nil? ? "" : ARGV[0]
-if ! cmd == "" and Beds::CLI.const_defined?(cmd.capitalize.to_sym) then
+if cmd != "" and Beds::CLI.const_defined?(cmd.capitalize) then
   Beds::CLI.const_get(cmd.capitalize.to_sym).send(:new,ARGV[1..-1])
   exit 0
 else
   puts " Usage: #{File.basename($0)} [scaffold|new] [OPTIONS]"
-  puts "   See #{File.basename($0)} scaffold --help or #{File.basename($0)} new --help foor more information"
+  puts "   See #{File.basename($0)} scaffold --help or #{File.basename($0)} new --help for more information"
   exit 1
 end
 

data/lib/new.rb

@@ -1,6 +1,52 @@
 module Beds
   module CLI
     class New
+      attr_accessor :options, :gems, :app,:opts
+
+      def initialize(opts)
+        @options = { :configru => true, :bundler => true, :git => true, :db => :dm,:view => 'erb' }
+        @gems=[]
+        parse_args(opts)
+        (STDERR.puts("Directory #{@app} already exists"); exit 1) if Dir.exist?("./#{@app}")
+        init_dirs
+        write_files
+      end
+      private
+      def parse_args(options)
+        @app ||= ""
+        opts = OptionParser.new
+        opts.banner = "Usage: #{__FILE__} [options] -a <app_name>"
+        opts.on('-a', '--app [app]') {|app| @app=app}
+        opts.on('-h', '--help', 'Display this information') { puts opts; exit }
+        opts.on('-g', '--include-gem GEM', 'Require gem in gemfile') {|gem| @gems << gem}
+        opts.on_tail("-h", "--help", "Display this information") { puts opts ; exit }
+        begin
+          (puts opts; exit 1) if options.empty? 
+          opts.parse! options
+        rescue OptionParser::InvalidArgument
+          opts.warn "Invalid Argument: #{$!}"
+          exit 1
+        end
+        return opts
+      end
+      def init_dirs
+        Dir.mkdir("./#{@app}")
+        Dir.chdir("./#{@app}")
+        Dir.mkdir("./tmp")
+        Dir.mkdir("./views")
+        Dir.mkdir("./public")
+        Dir.mkdir('./controllers')
+      end
+
+      def write_files
+        template_dir = "#{File.dirname(__FILE__)}/../templates/new"
+        template_files = Dir.exist?("~/.beds/new") ? Dir.glob("~/.beds/new/*") : Dir.glob("/#{template_dir}/*")
+        template_files.each do |file| 
+          File.open(File.basename(file).sub(/\.erb$/,""),"w") { |output| 
+            output.write(ERB.new(File.open(file).read,nil,"<>").result(binding))
+          }
+        end
+      end
     end
   end
 end

data/templates/new/Gemfile

@@ -0,0 +1,11 @@
+source :rubygems
+
+gem 'sinatra'
+gem 'dm-core'
+gem 'dm-mysql-adapter'
+gem 'dm-migrations'
+gem 'dm-validations'
+gem 'shotgun'
+<% @gems.each do |gem| %>
+gem '<%= gem %>'
+<% end unless @gems.empty? %>

data/templates/new/Rakefile

@@ -0,0 +1,9 @@
+namespace "db" do
+  desc "Migrate the database"
+  task :migrate, [:environment] do |t,args|
+    args.with_defaults(:environment => ENV['RAILS_ENV'].nil? ? "production" : ENV['RAILS_ENV'])
+    require './models.rb'
+    DataMapper.auto_migrate!
+  end
+end
+

data/templates/new/app.rb

@@ -0,0 +1,4 @@
+require 'sinatra'
+require './models.rb'
+Dir.glob("#{File.dirname(__FILE__)}/controllers/*.rb").each { |controller| load controller }
+

data/templates/new/config.ru

@@ -0,0 +1,3 @@
+require './app.rb'
+run Sinatra::Application
+

data/templates/new/models.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'dm-core'
+require 'dm-mysql-adapter'
+require 'dm-migrations'
+require 'dm-validations'
+
+DataMapper.setup(:default, "mysql://localhost/#{@app}")
+
+## Include Models Below.
+## Example:
+#class User
+#  include DataMapper::Resource
+#   property :id, Serial
+#   property  :name, String, :required => true, :messages => { :presence => "Please enter your name" }
+#   property  :login, String, :required => true, :unique => true, :messages => { :presence => "Please select a login ID", :is_unique => "Login already in use. Try again" }
+#   property  :pasword, String, :required => true, :length => 6..100, :messages => { :presence => "Please provide a password", :length => "Sorry.  Your password must be between 6 and 100 characters long." }
+#   property  :email, String, :format => :email_address, :unique => true, :messages => {  :format => "Please check your email address and try again.", :presence => "It looks like you forgot to enter your email address.", :is_unique => "Sorry. This email is already associated with a different account" }
+#   property  :level , Integer, :required => true
+#   property  :account_id, Integer, :required => true
+#end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beds
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2156320300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156320300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2156319800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *2156319800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156319380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156319380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily create Sinatra applications quikcly and easily by scaffolding
   your models.
 email: james@ruby-code.com
@@ -61,6 +76,11 @@ files:
 - ./templates/erb/new.erb
 - ./templates/hooks/bootstrap.rb
 - ./templates/hooks/jquery.rb
+- ./templates/new/app.rb
+- ./templates/new/config.ru
+- ./templates/new/Gemfile
+- ./templates/new/models.rb
+- ./templates/new/Rakefile
 - ./templates/routes/delete.erb
 - ./templates/routes/edit.erb
 - ./templates/routes/list.erb
@@ -93,7 +113,7 @@ requirements:
 - sinatra, version 1.3.3
 - rubyzip, version 0.9.9
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The BootStrap ERb DataMapper Sinatra [scaffolder]