rory 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05de9c3d6f0a76318d9caed584c858f6432819f
-  data.tar.gz: e178e368a1a4b614a4bc4b23086e325dcd086bbd
+  metadata.gz: 08a956b5ad20d37deb355ac86022eccc32d34b4c
+  data.tar.gz: fdce7d3b965c84e124a062c1c316db4863808e01
 SHA512:
-  metadata.gz: 0cef8af9eda07834faec41228bd5e6a8bc0dfbea13744ff47db9ceef058a57d736205530b8faf61af5dbd967ad62c35fd8adb0093b74fefd73059912f1250d4b
-  data.tar.gz: 1ce9adbb38f34bdaf3e6e6b25dc4978e973ef32c4bdc1c7b37a34663562a74c9d58dbc15c9d1d5ecf7bb2f4a1e6f6802086149f771ec9d61334d84a1db6c6c8f
+  metadata.gz: 2be8cabd2076c605e897bb75488cb58ced01d7d873bf29a7c5179267d68ba5b695e1625cc87e3a8704191aef700f9ccb4a5ae2a257eceba277ecdb85b4a3ed95
+  data.tar.gz: a3cb5d88bb4bc5b31aa19c861089452f308e5d4306c0aed99337d3411eff248e371150cbf1af120ac1560780d1e9876b6acf42cb06820f09b9715d0b741685ff

data/lib/rory/application.rb

@@ -59,7 +59,7 @@ module Rory
     initializer_default_middleware
 
     def auto_require_paths
-      @auto_require_paths ||= %w(models controllers helpers)
+      @auto_require_paths ||= %w(config/initializers models controllers helpers)
     end
 
     def require_all_files

data/lib/rory/cli.rb

@@ -0,0 +1,10 @@
+require "thor"
+require_relative "cli/root"
+
+module Rory
+  module CLI
+    def self.start
+      Root.start
+    end
+  end
+end

data/lib/rory/cli/generate.rb

@@ -0,0 +1,10 @@
+require "thor"
+require_relative "generators/application"
+
+module Rory
+  module CLI
+    class Generate < Thor
+      register Generators::Application, "app", "app [APP_NAME]", "Create a new Rory application"
+    end
+  end
+end

data/lib/rory/cli/generators/application.rb

@@ -0,0 +1,42 @@
+require "rory/support"
+
+module Rory
+  module CLI
+    module Generators
+      class Application < Thor::Group
+        include Thor::Actions
+
+        argument :name
+        class_option :rspec, type: :boolean
+
+        def self.source_root
+          File.join(File.dirname(__FILE__), "templates")
+        end
+
+        def apply_app_template
+          directory "app", tokenized_app_name, exclude_pattern: exclude_pattern
+        end
+
+      private
+
+        def exclude_pattern
+          patterns = [].tap { |patterns|
+            unless options[:rspec]
+              patterns << "spec\/spec_helper\.rb"
+              patterns << ".rspec"
+            end
+          }
+          patterns.empty? ? nil : /#{patterns.join("|")}/
+        end
+
+        def camelized_app_name
+          @camelized_app_name ||= Rory::Support.camelize(name)
+        end
+
+        def tokenized_app_name
+          @tokenized_app_name ||= Rory::Support.tokenize(name)
+        end
+      end
+    end
+  end
+end

data/lib/rory/cli/generators/templates/app/Gemfile.tt

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+gem "rory"
+gem "thin"
+
+group :development, :test do
+  gem "rake"
+<% if options[:rspec] -%>
+  gem "rspec"
+<% end -%>
+  gem "shotgun"
+end

data/lib/rory/cli/generators/templates/app/Rakefile.tt

@@ -0,0 +1,11 @@
+ENV["RORY_ENV"] ||= ENV["RACK_ENV"] || "development"
+
+require "bundler/setup"
+require "rory/tasks"
+
+Rake::TaskManager.record_task_metadata = true
+
+task :environment do
+  require_relative "config/application"
+  RORY_APP = <%= camelized_app_name %>::Application
+end

data/lib/rory/cli/generators/templates/app/config.ru.tt

@@ -0,0 +1,5 @@
+ENV['RORY_ENV'] ||= ENV['RACK_ENV'] || 'development'
+
+require_relative "config/application"
+
+run <%= camelized_app_name %>::Application

data/lib/rory/cli/generators/templates/app/config/application.rb.tt

@@ -0,0 +1,11 @@
+require "bundler"
+
+Bundler.require
+
+module <%= camelized_app_name %>
+  class Application < Rory::Application
+  end
+end
+
+<%= camelized_app_name %>::Application.root = File.expand_path(File.join("..", ".."), __FILE__)
+<%= camelized_app_name %>::Application.require_all_files

data/lib/rory/cli/generators/templates/app/config/routes.rb.tt

@@ -0,0 +1,3 @@
+<%= camelized_app_name %>::Application.set_routes do
+  # match "path/with/:params", to: "controller#action", methods: [:get]
+end

data/lib/rory/cli/generators/templates/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < Rory::Controller
+end

data/lib/rory/cli/generators/templates/app/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+ENV['RORY_ENV'] = 'test'
+require 'rspec'
+require 'rory'
+
+RSpec.configure do |config|
+end

data/lib/rory/cli/root.rb

@@ -0,0 +1,17 @@
+require "thor"
+require_relative "generate"
+
+module Rory
+  module CLI
+    class Root < Thor
+      desc "version", "Display version of installed Rory"
+      map %w[-v --version] => :version
+      def version
+        say "rory #{Rory::VERSION}"
+      end
+
+      register Generators::Application, "new", "new [APP_NAME]", "Create a new Rory application"
+      register Generate, "generate", "generate [COMMAND]", "Delegate to generate command"
+    end
+  end
+end

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

data/rory.gemspec

@@ -27,12 +27,14 @@ EOF
                   %w(LICENSE.txt Rakefile README.md rory.gemspec)
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
+  s.bindir = "bin"
 
   s.add_runtime_dependency 'rack', '~> 1.0'
   s.add_runtime_dependency 'rack-contrib', '~> 1.2'
   s.add_runtime_dependency 'sequel', '~> 4.0'
   s.add_runtime_dependency 'thin', '~> 1.0'
   s.add_runtime_dependency 'thread-inheritable_attributes', '~> 0.1'
+  s.add_runtime_dependency 'thor', '~> 0.19'
 
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rspec', '~> 3'

data/spec/lib/rory/application_spec.rb

@@ -238,13 +238,13 @@ RSpec.describe Rory::Application do
       subject.instance.instance_variable_set(:@auto_require_paths, nil)
     end
 
-    it 'includes models, controllers, and helpers by default' do
-      expect(subject.auto_require_paths).to eq(['models', 'controllers', 'helpers'])
+    it 'includes initializers, models, controllers, and helpers by default' do
+      expect(subject.auto_require_paths).to eq(['config/initializers', 'models', 'controllers', 'helpers'])
     end
 
     it 'accepts new paths' do
       subject.auto_require_paths << 'chocolates'
-      expect(subject.auto_require_paths).to eq(['models', 'controllers', 'helpers', 'chocolates'])
+      expect(subject.auto_require_paths).to eq(['config/initializers', 'models', 'controllers', 'helpers', 'chocolates'])
     end
   end
 

data/spec/lib/rory/cli/generate_spec.rb

@@ -0,0 +1,16 @@
+require "rory/cli"
+
+RSpec.describe Rory::CLI::Generate do
+  describe "#app" do
+    it "starts Generators::Application" do
+      proxy = instance_double(Rory::CLI::Generators::Application)
+      allow(proxy).to receive(:parent_options=).with({})
+      allow(Rory::CLI::Generators::Application).to receive(:new).
+        with(["frog"], any_args).
+        and_return(proxy)
+
+      expect(proxy).to receive(:invoke_all)
+      subject.app("frog")
+    end
+  end
+end

data/spec/lib/rory/cli/generators/application_spec.rb

@@ -0,0 +1,35 @@
+require "rory/cli"
+
+describe Rory::CLI::Generators::Application do
+  let(:options) { {} }
+  let(:args) { ["an app"] }
+  subject { described_class.new(args, options, :destination_root => sandbox_directory) }
+
+  after(:each) do
+    FileUtils.rm_rf sandbox_directory
+  end
+
+  context "with default options" do
+    it "generates a new application directory with no optional files" do
+      capture_output { subject.invoke_all }
+      expect(sandbox_directory.join("an_app")).to be_a_directory
+      expect(sandbox_directory.join("an_app", "config.ru")).to be_a_file
+      expect(sandbox_directory.join("an_app", ".rspec")).not_to be_a_file
+    end
+
+    it "logs the output" do
+      result = capture_output { subject.invoke_all }
+      expect(result).to include("create  an_app")
+    end
+  end
+
+  context "with default options" do
+    let(:options) { { rspec: true } }
+
+    it "adds rspec files" do
+      capture_output { subject.invoke_all }
+      expect(sandbox_directory.join("an_app", ".rspec")).to be_a_file
+      expect(sandbox_directory.join("an_app", "spec", "spec_helper.rb")).to be_a_file
+    end
+  end
+end

data/spec/lib/rory/cli/root_spec.rb

@@ -0,0 +1,30 @@
+require "rory/cli"
+
+RSpec.describe Rory::CLI::Root do
+  describe "#version" do
+    it "says the current Rory VERSION constant" do
+      expect(subject).to receive(:say).with("rory #{Rory::VERSION}")
+      subject.version
+    end
+  end
+
+  describe "#generate" do
+    it "delegates to generate" do
+      expect(Rory::CLI::Root.subcommand_classes["generate"]).
+        to eq(Rory::CLI::Generate)
+    end
+  end
+
+  describe "#new" do
+    it "starts Generators::Application" do
+      proxy = instance_double(Rory::CLI::Generators::Application)
+      allow(proxy).to receive(:parent_options=).with({})
+      allow(Rory::CLI::Generators::Application).to receive(:new).
+        with(["frog"], any_args).
+        and_return(proxy)
+
+      expect(proxy).to receive(:invoke_all)
+      subject.new("frog")
+    end
+  end
+end

data/spec/lib/rory/cli_spec.rb

@@ -0,0 +1,10 @@
+require "rory/cli"
+
+RSpec.describe Rory::CLI do
+  describe "#start" do
+    it "delegates to Root class" do
+      allow(Rory::CLI::Root).to receive(:start).and_return(:started)
+      expect(described_class.start).to eq :started
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -21,4 +21,5 @@ Capybara.app = Fixture::Application
 
 RSpec.configure do |config|
   config.order = "random"
+  config.include GenerationHelpers
 end

data/spec/support/generation_helpers.rb

@@ -0,0 +1,19 @@
+module GenerationHelpers
+  def sandbox_directory
+    Pathname.new(
+      File.join(File.dirname(__FILE__), "..", "sandbox")
+    )
+  end
+
+  def capture_output
+    begin
+      $stdout = StringIO.new
+      yield
+      result = $stdout.string
+    ensure
+      $stdout = STDOUT
+    end
+
+    result
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Ravi Gadad
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -83,6 +83,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +242,17 @@ files:
 - Rakefile
 - lib/rory.rb
 - lib/rory/application.rb
+- lib/rory/cli.rb
+- lib/rory/cli/generate.rb
+- lib/rory/cli/generators/application.rb
+- lib/rory/cli/generators/templates/app/Gemfile.tt
+- lib/rory/cli/generators/templates/app/Rakefile.tt
+- lib/rory/cli/generators/templates/app/config.ru.tt
+- lib/rory/cli/generators/templates/app/config/application.rb.tt
+- lib/rory/cli/generators/templates/app/config/routes.rb.tt
+- lib/rory/cli/generators/templates/app/controllers/application_controller.rb
+- lib/rory/cli/generators/templates/app/spec/spec_helper.rb
+- lib/rory/cli/root.rb
 - lib/rory/controller.rb
 - lib/rory/dispatcher.rb
 - lib/rory/initializers.rb
@@ -269,6 +294,10 @@ files:
 - spec/fixture_app/views/test/nested.html.erb
 - spec/fixture_app/views/test/static.html.erb
 - spec/lib/rory/application_spec.rb
+- spec/lib/rory/cli/generate_spec.rb
+- spec/lib/rory/cli/generators/application_spec.rb
+- spec/lib/rory/cli/root_spec.rb
+- spec/lib/rory/cli_spec.rb
 - spec/lib/rory/controller_spec.rb
 - spec/lib/rory/dispatcher_spec.rb
 - spec/lib/rory/initializers_spec.rb
@@ -285,6 +314,7 @@ files:
 - spec/lib/rory_spec.rb
 - spec/requests/controller_spec.rb
 - spec/spec_helper.rb
+- spec/support/generation_helpers.rb
 - spec/support/shared_examples/path_generation.rb
 homepage: http://github.com/screamingmuse/rory
 licenses:
@@ -306,9 +336,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Another Ruby web framework. Just what the world needs.
 test_files: []
-has_rdoc: