sinatra-template 1.2.0 → 1.3.0

data/lib/sinatra/commands/app_destroyer_command.rb

@@ -8,34 +8,28 @@ module Sinatra
     def self.help
       "app_name"
     end
-    
-    def initialize(*args)
-      super
-      @app_dir = File.expand_path(pwd)
-    end
 
     def classified
       "#{self.name.classify}App"
     end
 
     def call
-      path = File.expand_path(File.join(@app_dir, "apps", "#{self.underscored}.rb"))
-      begin
-        rm path, verbose: true
-      rescue Errno::ENOENT => e
-      end
-      path = File.expand_path(File.join(@app_dir, "apps", "views", self.underscored))
-      begin
-        rm_r path, verbose: true
-      rescue Errno::ENOENT => e
-      end
-      path = File.expand_path(File.join(@app_dir, "spec", "apps", "#{self.underscored}_spec.rb"))
-      begin
-        rm path, verbose: true
-      rescue Errno::ENOENT => e
-      end
+      path = app_path("apps", "#{self.underscored}.rb")
+      rm path
+
+      path = app_path("apps", "views", self.underscored)
+      rm_r path
+
+      path = app_path("spec", "apps", "#{self.underscored}_spec.rb")
+      rm path
+
+      path = app_path("assets", "javascripts", "#{self.underscored}.js.coffee")
+      rm path
+
+      path = app_path("assets", "stylesheets", "#{self.underscored}.css.scss")
+      rm path
 
-      path = File.expand_path(File.join(@app_dir, "config.ru"))
+      path = app_path("config.ru")
       old = File.read(path)
       File.open(path, "w") do |file|
         map = <<-EOF

data/lib/sinatra/commands/app_generator_command.rb

@@ -9,11 +9,6 @@ module Sinatra
       "app_name"
     end
 
-    def initialize(*args)
-      super
-      @app_dir = File.expand_path(pwd)
-    end
-
     def classified
       "#{self.name.classify}App"
     end
@@ -21,18 +16,24 @@ module Sinatra
     def call
       # mkdir self.underscored, verbose: true
       %w{apps spec/apps}.each do |dir|
-        Dir[File.expand_path(File.join(dir, "**", "*"), Sinatra.template_dir)].each do |f|
+        Dir[template_path("**", "*")].each do |f|
           if File.directory?(f)
-            mkdir_p clean_string(f), verbose: true
+            FileUtils.mkdir_p clean_string(f), verbose: true
           else
-            mkdir_p clean_string(File.dirname(f)), verbose: true
+            FileUtils.mkdir_p clean_string(File.dirname(f)), verbose: true
             File.open(clean_string(f), 'w') do |file|
               file.puts clean_string(File.read(f))
             end
           end
         end
       end
-      File.open(File.expand_path(File.join(@app_dir, "config.ru")), "a") do |file|
+      File.open(app_path("assets", "javascripts", "#{self.underscored}.js.coffee"), 'w') do |file|
+        file.puts ""
+      end
+      File.open(app_path("assets", "stylesheets", "#{self.underscored}.css.scss"), 'w') do |file|
+        file.puts ""
+      end
+      File.open(app_path("config.ru"), "a") do |file|
         file.puts <<-EOF
   map "/#{self.underscored}" do
     run #{self.classified}
@@ -40,19 +41,6 @@ module Sinatra
         EOF
       end
 
-      path = File.expand_path(File.join(@app_dir, "spec", "apps", "#{self.underscored}_spec.rb"))
-      mkdir_p File.dirname(path), verbose: true
-      File.open(path, 'w') do |file|
-        file.puts <<-EOF
-  require 'spec_helper'
-
-  describe #{self.classified} do
-    
-    it "does something"
-
-  end
-        EOF
-      end
     end
 
   end

data/lib/sinatra/commands/command.rb

@@ -23,5 +23,27 @@ module Sinatra
       system command
     end
 
+    def rm(path)
+      begin
+        FileUtils.rm path, verbose: true
+      rescue Errno::ENOENT => e
+      end
+    end
+
+    def rm_r(path)
+      begin
+        FileUtils.rm_r path, verbose: true
+      rescue Errno::ENOENT => e
+      end
+    end
+
+    def app_path(*path)
+      File.expand_path(File.join(@app_dir, *path))
+    end
+
+    def template_path(*path)
+      File.expand_path(File.join(Sinatra.template_dir, *path))
+    end
+
   end
 end

data/lib/sinatra/commands/console_command.rb

@@ -10,7 +10,7 @@ module Sinatra
     end
 
     def call
-      path = File.expand_path(File.join(@app_dir, "setup.rb"))
+      path = app_path("setup.rb")
       cmd "pry -r #{path}"
     end
 

data/lib/sinatra/commands/env_command.rb

@@ -10,7 +10,7 @@ module Sinatra
 
     def initialize(args)
       self.args = args
-      @app_dir = File.expand_path(pwd)
+      @app_dir = File.expand_path(FileUtils.pwd)
       self.env = args[1] || "development"
       ENV["RACK_ENV"] = self.env
     end

data/lib/sinatra/commands/model_destroyer_command.rb

@@ -8,23 +8,10 @@ module Sinatra
     def self.help
       "model_name"
     end
-    
-    def initialize(*args)
-      super
-      @app_dir = File.expand_path(pwd)
-    end
 
     def call
-      path = File.expand_path(File.join(@app_dir, "models", "#{self.underscored}.rb"))
-      begin
-        rm path, verbose: true
-      rescue Errno::ENOENT => e
-      end
-      path = File.expand_path(File.join(@app_dir, "spec", "models", "#{self.underscored}_spec.rb"))
-      begin
-        rm path, verbose: true
-      rescue Errno::ENOENT => e
-      end
+      rm app_path("models", "#{self.underscored}.rb")
+      rm app_path("spec", "models", "#{self.underscored}_spec.rb")
     end
 
   end

data/lib/sinatra/commands/model_generator_command.rb

@@ -9,14 +9,9 @@ module Sinatra
       "model_name"
     end
 
-    def initialize(*args)
-      super
-      @app_dir = File.expand_path(pwd)
-    end
-
     def call
-      path = File.expand_path(File.join(@app_dir, "models", "#{self.underscored}.rb"))
-      mkdir_p File.dirname(path), verbose: true
+      path = app_path("models", "#{self.underscored}.rb")
+      FileUtils.mkdir_p File.dirname(path), verbose: true
       File.open(path, 'w') do |file|
         file.puts <<-EOF
   class #{self.classified}
@@ -27,8 +22,8 @@ module Sinatra
         EOF
       end
 
-      path = File.expand_path(File.join(@app_dir, "spec", "models", "#{self.underscored}_spec.rb"))
-      mkdir_p File.dirname(path), verbose: true
+      path = app_path("spec", "models", "#{self.underscored}_spec.rb")
+      FileUtils.mkdir_p File.dirname(path), verbose: true
       File.open(path, 'w') do |file|
         file.puts <<-EOF
   require 'spec_helper'

data/lib/sinatra/commands/name_command.rb

@@ -1,6 +1,5 @@
 module Sinatra
   class NameCommand < Sinatra::Command
-    include FileUtils
 
     attr_accessor :args, :name
 
@@ -19,6 +18,7 @@ module Sinatra
     def initialize(args)
       self.args = args
       self.name = ARGV[1]
+      @app_dir = File.expand_path(FileUtils.pwd)
     end
 
     def clean_string(f)

data/lib/sinatra/commands/new_project_generator_command.rb

@@ -11,7 +11,7 @@ module Sinatra
 
     def initialize(*args)
       super
-      @app_dir = File.expand_path(File.join(pwd, self.underscored))
+      @app_dir = File.expand_path(File.join(FileUtils.pwd, self.underscored))
     end
 
     def classified
@@ -19,17 +19,31 @@ module Sinatra
     end
 
     def call
-      mkdir self.underscored, verbose: true
-      Dir[File.expand_path(File.join("**", "*"), Sinatra.template_dir)].each do |f|
+      FileUtils.mkdir self.underscored, verbose: true
+      Dir[template_path("**", "*")].each do |f|
         if File.directory?(f)
-          mkdir_p clean_string(f), verbose: true
+          FileUtils.mkdir_p clean_string(f), verbose: true
         else
-          mkdir_p clean_string(File.dirname(f)), verbose: true
+          FileUtils.mkdir_p clean_string(File.dirname(f)), verbose: true
           File.open(clean_string(f), 'w') do |file|
             file.puts clean_string(File.read(f))
           end
         end
       end
+      File.open(app_path(".gitignore"), "w") do |f|
+        f.puts File.read(template_path(".gitignore"))
+      end
+      Dir[app_path("**", "*")].each do |file|
+        if File.directory?(file)
+          if Dir[File.join(file, "**", "*")].empty?
+            File.open(File.join(file, ".git-keep"), 'w') {|f| f.puts ""}
+          end
+        end
+      end
+      FileUtils.cd app_path
+      system "git init"
+      system "git add ."
+      system "git commit -a -m 'Initial Commit'"
     end
 
   end

data/lib/sinatra/commands/start_command.rb

@@ -10,11 +10,11 @@ module Sinatra
     end
 
     def call
-      path = File.expand_path(File.join(@app_dir, "Procfile.#{self.env}"))
+      path = app_path("Procfile.#{self.env}")
       if File.exists?(path)
         cmd "bundle exec foreman start -f #{path}"
       else
-        path = File.expand_path(File.join(@app_dir, "Procfile"))
+        path = app_path("Procfile")
         cmd "bundle exec foreman start -f #{path}"
       end
     end

data/lib/sinatra/template/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Template
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/template_app/Gemfile

@@ -8,6 +8,7 @@ gem 'shotgun'
 gem 'foreman'
 gem 'mongoid'
 gem 'activesupport'
+gem 'eco'
 
 group :development, :test do
   gem 'rack-test'

data/template_app/Gemfile.lock

@@ -13,12 +13,18 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     builder (3.0.4)
+    coderay (1.0.8)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
     daemons (1.1.9)
     diff-lcs (1.1.3)
+    eco (1.0.0)
+      coffee-script
+      eco-source
+      execjs
+    eco-source (1.1.0.rc.1)
     eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -26,6 +32,7 @@ GEM
       thor (>= 0.13.6)
     hike (1.2.1)
     i18n (0.6.1)
+    method_source (0.8.1)
     mongoid (3.0.15)
       activemodel (~> 3.1)
       moped (~> 1.1)
@@ -34,6 +41,10 @@ GEM
     moped (1.3.1)
     multi_json (1.5.0)
     origin (1.0.11)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rack (1.4.1)
     rack-protection (1.3.2)
       rack
@@ -54,6 +65,7 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    slop (3.3.3)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -73,8 +85,10 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   coffee-script
+  eco
   foreman
   mongoid
+  pry
   rack-test
   rspec
   sass

data/template_app/apps/views/template_app/layout.erb

@@ -8,8 +8,10 @@
     <meta name="author" content="">
 
     <script src='/assets/application.js'></script>
+    <script src='/assets/template_app.js'></script>
     <%= bootstrap_assets %>
     <link href="/assets/application.css" rel="stylesheet">
+    <link href="/assets/template_app.css" rel="stylesheet">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>

data/template_app/assets/javascripts/application.js.coffee

@@ -2,6 +2,7 @@
 #= require json2
 #= require underscore
 #= require backbone
+#= require_tree ../templates
 
 $ ->
   $("#main").append("jQuery works!")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-template
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -69,7 +69,9 @@ files:
 - template_app/apps/views/template_app/index.erb
 - template_app/apps/views/template_app/layout.erb
 - template_app/assets/javascripts/application.js.coffee
+- template_app/assets/javascripts/template_app.js.coffee
 - template_app/assets/stylesheets/application.css.scss
+- template_app/assets/stylesheets/template_app.css.scss
 - template_app/assets/templates/.git-keep
 - template_app/config.ru
 - template_app/models/.git-keep