modularize_sinatra 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a3d7bbe83add8251a23540153298e9fc1965029
-  data.tar.gz: 0e7dc3d6f288d53a4493242cd562b4e319e77f68
+  metadata.gz: d12e2c1d1380144ecf1b80e01cec41ca48802d70
+  data.tar.gz: 1b89c821801ed22a8e8b8c15569ed3796e852b5a
 SHA512:
-  metadata.gz: e8765f60d8d9fdeff19aedc0f00d7d5348acc9b6814ecede6a278c985b8c092aacdd3d5d6bcc841def576d56d9deddfaa9231c07eeb70e0c8fa4d2afb0600bd3
-  data.tar.gz: 5edeb22da671451f7c4edee9cfead910fc9c8f60bf6d0bc6900860484bbcbfde9f9ec30f60563dbbd5eb957605e596200005069d20d0f677402f6f723d1640ff
+  metadata.gz: 696eaa9d1f7623b806c038c5f4c68337f629600b541f454fe475d6dea9324215acd4f02450dd40239b54cefb7a0aeabf1d1a762a9b6d567b0a43570d9035b9b2
+  data.tar.gz: 13eba011f55b9cab8b8fd030a5dd1bf0108fe3785086b389bea27e642a17eca281b25be211247375a9cd43707333ddb2fa636da5d7cbbca6a0e709254be93925

data/.gitignore

@@ -15,3 +15,8 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2013 goyalankit
+Copyright (c) 2014 Ankit Goyal
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,79 +1,29 @@
-# Modularize Sinatra
+# ModularizeSinatra
 
-[![Gem Version](https://badge.fury.io/rb/modularize_sinatra.png)](http://badge.fury.io/rb/modularize_sinatra)
-
-Modularized Code Generator for Sinatra. Gem available on [rubygems](https://rubygems.org/gems/modularize_sinatra)
-More information at: http://goyalankit.com/blog/2013/07/23/modularize-sinatra/
+TODO: Write a gem description
 
 ## Installation
 
-    $ gem install modularize_sinatra
-
-## Usage
-
-To generate the skeleton structure with custom controller:
-
-    modularize_sinatra myapp -C user
-
-To Start the app:
-    
-    rackup -p 9292
+Add this line to your application's Gemfile:
 
-It will generate a default index page for you, which can be accessed at:
-    
-    http://localhost:9292/
+    gem 'modularize_sinatra'
 
-You'll get the following directory structure with above command:
+And then execute:
 
-    .
-    |-- Gemfile
-    |-- Rakefile
-    |-- config
-    |   `-- environment.rb
-    |-- config.ru
-    |-- lib
-    |   |-- app.rb
-    |   |-- controllers
-    |   |   `-- user.rb
-    |   `-- views
-    |       `-- users
-    |           `-- index.erb
-    |-- myapp.rb
-    |-- public
-    |-- script
-    |-- spec
-    |   |-- controllers
-    |   |   `-- user_spec.rb
-    |   |-- spec_helper.rb
-    |   `-- support
-    `-- tmp
+    $ bundle
 
-Without the `-C` paramter( **not recommended** ), it will generate a default controller for you called `Ping` and will create the following route:
+Or install it yourself as:
 
-    GET http://localhost:9292/ping
-    > Ahoy! from Myapp 2013-04-07 00:33:58 +0530
-
-Currently `rspec` is configured by default. Hope to release support for other frameworks in future versions.
-
-To Run specs:
-
-    bundle exec rake 
-    
-## TODO
+    $ gem install modularize_sinatra
 
-1. Support for active record.
-2. More testing frameworks.
-    
-## Authors
+## Usage
 
- * [@_goyalankit](http://twitter.com/_goyalankit)
- * [more projects](http://goyalankit.com/labs)
+TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it
+1. Fork it ( https://github.com/[my-github-username]/modularize_sinatra/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
+5. Create a new Pull Request

data/Rakefile

@@ -1,3 +1,2 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
-require "bundler/setup"
+

data/bin/modularize_sinatra

@@ -1,39 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'rubigen'
-
-#Monkey patching for source_index deprecation
-unless Gem.respond_to?(:source_index)
-  module Gem
-    def self.source_index
-      sources
-    end
-
-    def self.cache
-      sources
-    end
-
-    SourceIndex = Specification
-
-    class SourceList
-      # If you want vendor gems, this is where to start writing code.
-      def search( *args ); []; end
-      def each( &block ); end
-      include Enumerable
-    end
-  end
-end
-
-if %w(-v --version).include? ARGV.first
-  require 'modularize_sinatra'
-  puts "#{File.basename($0)} #{ModularizeSinatra::VERSION}"
-  exit(0)
-end
-
-require 'rubigen/scripts/generate'
-source = RubiGen::PathSource.new(:application, 
-  File.join(File.dirname(__FILE__), "../lib"))
-RubiGen::Base.reset_sources
-RubiGen::Base.append_sources source
-RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'modularize_sinatra')
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'modularize_sinatra/cli'
+ModularizeSinatra::CLI.start

data/lib/modularize_sinatra.rb

@@ -1,5 +1,11 @@
+require "active_support/inflector"
 require "modularize_sinatra/version"
+require "modularize_sinatra/helper_methods"
+require "modularize_sinatra/app_generator"
 
 module ModularizeSinatra
-  #nothing fancy here
+  # root of the gem
+  def self.root
+    File.expand_path '../..', __FILE__
+  end
 end

data/lib/modularize_sinatra/app_generator.rb

@@ -0,0 +1,104 @@
+module ModularizeSinatra
+  require 'erubis'
+  class AppGenerator
+    attr_accessor :app_name, :controller_name, :controller_module_name, :module_name, :app_root, :test_framework
+    def initialize app_name, controller_name
+      @app_name = app_name
+      @controller_name = controller_name
+      @controller_module_name = controller_name.camelize
+      @module_name = app_name.camelize
+      @templates_path = File.join(File.expand_path(File.dirname(__FILE__)), 'templates')
+      @test_framework = "rspec"
+    end
+
+    def full_path destination
+      File.join(@app_root, destination)
+    end
+
+    def add_file source, destination
+      destination_path = full_path(destination)
+      input = File.read(File.join(@templates_path, source))
+      eruby = Erubis::Eruby.new(input)
+      
+      already_exists = false
+      overwrite = true
+
+      if File.exists?(destination_path)
+        print "File #{destination_path} already exists. Overwrite(Y/n)? "
+        user_says = STDIN.gets.chomp
+        overwrite = false unless user_says.downcase == 'y'
+        already_exists = true
+      end
+
+      if overwrite
+        puts "#{already_exists ? 'overwriting' : 'creating'}" << " #{destination_path}"
+        File.open(destination_path, 'w') { |file| file.write(eruby.result(binding())) }
+      else
+        puts "skipping #{destination_path}"
+      end
+
+    end
+
+    # this method adds directory w.r.t root path of the app
+    def add_dir destination
+      destination_path = full_path(destination)
+      Dir.mkdir(destination_path) unless Dir.exists?(destination_path)
+      puts "creating directory #{@app_name}/#{destination}"
+    end
+
+    def create_app_dir
+      Dir.mkdir(@app_name) unless Dir.exists?(@app_name)
+      @app_root = File.join(Dir.pwd, @app_name)
+    end
+
+    def generate
+      # generate root directory
+      create_app_dir
+
+      # create all directories
+      # order is important here
+      dirs = [
+        "config", 
+        "lib", 
+        "lib/controllers", 
+        "lib/views", 
+        "spec", 
+        "spec/controllers"
+      ]
+
+      # if controller is not default
+      if @controller_name != "ping"
+        dirs << "lib/views/#{@controller_name.pluralize}"
+      end
+
+      dirs.each do |dir|
+        add_dir(dir)
+      end
+
+      # create all files
+      files = {
+        "config/environment.rb" => "config/environment.rb",
+        "lib/app.rb" => "lib/app.rb",
+        "spec/spec_helper.rb" => "spec/spec_helper.rb",
+        "config.ru" => "config.ru",
+        "Gemfile" => "Gemfile",
+        "module.rb" => "#{@app_name}.rb",
+        "Rakefile" => "Rakefile"
+      }
+
+      # add default ping controller
+      if @controller_name == "ping"
+        files["lib/controllers/ping.rb"] = "lib/controllers/ping.rb"
+        files["spec/controllers/ping_spec.rb"] = "spec/controllers/ping_spec.rb"
+      else
+        files["lib/controllers/controller.rb"] = "lib/controllers/#{@controller_name}.rb"
+        files["lib/views/index.erb"] = "lib/views/#{@controller_name.pluralize}/index.erb"
+        files["spec/controllers/controller_spec.rb"] = "spec/controllers/#{@controller_name}_spec.rb"
+      end
+
+      files.each do |src, dest|
+        add_file src, dest
+      end
+    end
+  end
+end

data/lib/modularize_sinatra/cli.rb

@@ -0,0 +1,14 @@
+require 'thor'
+require 'modularize_sinatra'
+module ModularizeSinatra
+  class CLI < Thor
+    desc "new", "Create a new app"
+    option :c, :default => "ping", :aliases => :C
+    def new(app_name)
+      app_generator = AppGenerator.new(app_name, options[:c])
+      app_generator.generate
+    end
+
+    default_task :new
+  end
+end

data/lib/modularize_sinatra/templates/config.ru

@@ -6,6 +6,6 @@ $: << File.dirname(__FILE__)
 
 ENV['RACK_ENV'] ||= 'development'
 
-require '<%= project_name %>'
+require '<%= app_name %>'
 run <%= module_name %>::App
 

data/lib/modularize_sinatra/templates/spec/controllers/controller_spec.rb

@@ -7,7 +7,7 @@ describe  <%= module_name %>::Controllers::<%= controller_module_name %> do
 
   it "should do nothing" do
     get '/'
-    last_response.status.should == 200
+    expect(last_response.status).to eq(200)
   end
 end
 

data/lib/modularize_sinatra/templates/spec/controllers/ping_spec.rb

@@ -8,8 +8,8 @@ describe  <%= module_name %>::Controllers::Ping do
     describe "get /ping" do
       it "should return 200" do
         get :ping
-        last_response.body.should == "Ahoy! from <%= module_name %> #{Time.now}"
-        last_response.status.should == 200
+        expect(last_response.body).to eq("Ahoy! from <%= module_name %> #{Time.now}")
+        expect(last_response.status).to eq(200)
       end
     end
 end

data/lib/modularize_sinatra/templates/spec/spec_helper.rb

@@ -9,11 +9,11 @@ $: << spec_root
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 Sinatra::Base.set :environment, :test
-require File.join(File.dirname(__FILE__), '..', '<%= project_name %>')
+require File.join(File.dirname(__FILE__), '..', '<%= app_name %>')
 Dir[File.join(spec_root, "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
   config.include Sinatra::TestHelpers
 end
 

data/lib/modularize_sinatra/version.rb

@@ -1,3 +1,3 @@
 module ModularizeSinatra
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/modularize_sinatra.gemspec

@@ -1,21 +1,25 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/modularize_sinatra/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'modularize_sinatra/version'
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Ankit Goyal"]
-  gem.email         = ["ankit3goyal@gmail.com"]
-  gem.description   = %q{Code Generator for Sinatra}
-  gem.summary       = %q{Creates a modular skeleton for Sinatra application.}
-  gem.homepage      = "https://github.com/goyalankit/modularize_sinatra"
+Gem::Specification.new do |spec|
+  spec.name          = "modularize_sinatra"
+  spec.version       = ModularizeSinatra::VERSION
+  spec.authors       = ["Ankit Goyal"]
+  spec.email         = ["ankit3goyal@gmail.com"]
+  spec.summary       = %q{Creates a modular skeleton for Sinatra application.}
+  spec.description   = %q{Code Generator for Sinatra}
+  spec.homepage      = "https://github.com/goyalankit/modularize_sinatra"
+  spec.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "modularize_sinatra"
-  gem.require_paths = ["lib"]
-  gem.version       = ModularizeSinatra::VERSION
-  gem.add_development_dependency "rake"
-  gem.add_dependency "rubigen"
-  gem.add_dependency "i18n"
-  gem.add_dependency 'activesupport', '>= 2.3.5', "< 3.2.0"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_dependency "thor"
+  spec.add_dependency "erubis"
 end

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: modularize_sinatra
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ankit Goyal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rubigen
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,25 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 description: Code Generator for Sinatra
 email:
 - ankit3goyal@gmail.com
@@ -82,13 +76,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/modularize_sinatra
 - lib/modularize_sinatra.rb
-- lib/modularize_sinatra/USAGE
-- lib/modularize_sinatra/modularize_sinatra_generator.rb
+- lib/modularize_sinatra/app_generator.rb
+- lib/modularize_sinatra/cli.rb
+- lib/modularize_sinatra/helper_methods.rb
 - lib/modularize_sinatra/templates/Gemfile
 - lib/modularize_sinatra/templates/Rakefile
 - lib/modularize_sinatra/templates/config.ru
@@ -104,7 +99,8 @@ files:
 - lib/modularize_sinatra/version.rb
 - modularize_sinatra.gemspec
 homepage: https://github.com/goyalankit/modularize_sinatra
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -122,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Creates a modular skeleton for Sinatra application.

data/lib/modularize_sinatra/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/lib/modularize_sinatra/modularize_sinatra_generator.rb

@@ -1,89 +0,0 @@
-class ModularizeSinatraGenerator < RubiGen::Base
-
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
-
-  default_options   :shebang => DEFAULT_SHEBANG,
-                    :version     => '0.0.1',
-                    :controller_name => 'Ping'
-
-  attr_reader :name, :module_name, :project_name
-  attr_reader :controller_name, :controller_module_name
-
-  # extensions/option
-  attr_reader :test_framework
-
-
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @destination_root = File.expand_path(args.shift)
-    @name = base_name
-    @project_name = @name
-    @module_name  = name.gsub('-','_').camelize
-    extract_options
-  end
-
-  def manifest
-    record do |m|
-      m.directory ''
-      BASEDIRS.each { |path| m.directory path }
-
-      m.template_copy_each %w( Gemfile config.ru Rakefile)
-      m.template "module.rb", "#{project_name}.rb"
-      m.template "lib/app.rb", "lib/app.rb"
-      m.template "config/environment.rb", "config/environment.rb"
-      m.template "spec/spec_helper.rb", "spec/spec_helper.rb"
-
-      #controller for app
-      case controller_name
-      when 'Ping'
-        m.template "lib/controllers/ping.rb", "lib/controllers/ping.rb"
-        m.template "spec/controllers/ping_spec.rb", "spec/controllers/ping_spec.rb"
-      else
-        m.template "lib/controllers/controller.rb", "lib/controllers/#{controller_name}.rb"
-        m.template "spec/controllers/controller_spec.rb", "spec/controllers/#{controller_name}_spec.rb"
-        m.directory "lib/views/#{controller_name.pluralize}"
-        m.template "lib/views/index.erb", "lib/views/#{controller_name.pluralize}/index.erb"
-      end
-    end
-  end
-
-  protected
-    def banner
-      <<-EOS
-Creates a skeltan for modularized Sinatra Applications
-
-USAGE: #{spec.name} name
-EOS
-    end
-
-    def add_options!(opts)
-      opts.separator ''
-      opts.separator 'Options:'
-      opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-      opts.on("-T", "--test-with=TEST_FRAMEWORK", String,
-              "Select your preferred testing framework.",
-              "Options: rspec (default), test_unit.") { |x| options[:test_framework] = x }
-      opts.on("-C", "--controller=CONTROLLER_NAME", String,
-              "Give name of your initial controller",
-              "default name give is Ping.") { |x| options[:controller_name] = x }
-    end
-
-    def extract_options
-      @test_framework     =  "rspec"
-      @controller_name    = options[:controller_name] || "Ping"
-      @controller_module_name = controller_name.gsub('-','_').camelize
-    end
-
-    BASEDIRS = %w(
-      config
-      lib/controllers
-      lib/views
-      public
-      spec/controllers
-      spec/support
-      script
-      tmp
-    )
-end