hoboken 0.0.1.beta → 0.0.1.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f1a0724865d4b6998165c52a8e631a96f43f636
-  data.tar.gz: e76a4320fb46db77356346d6d5fa905c7c9b0f13
+  metadata.gz: d93ed494dde1289a45fcfb75ffa80285d0995020
+  data.tar.gz: cd9319eef83037bf07083d0cc0740fc94fc0b415
 SHA512:
-  metadata.gz: bd597e454af06c4981761c4d46541d67c54febbd53defb223d07ff958f8df5f0b3357f667ae0577f201bc5d5f84d4743cae1f4fed8084039707b52b4c77b6f51
-  data.tar.gz: 15ae3353f633cbcbbb1b362381809beb38729d7df2aa26b4f5e6302083bb3fb7f6297e50022959915890c4420b87f72892609cba0efafa02ed058e5c7751c507
+  metadata.gz: 2b4f2c2ccccb2ac0fecd1e76236fe52669478facb48a61d0791ab574fac940001e0dfa7f3b9127d4436d3b323010968432a86e72cb4844df6bce31cb405bb2f0
+  data.tar.gz: 6019310cb5cdb8005948b4ed8a9b5fc275a2c927ba40a771a9c3a72fa13881db4891339964b67f2f87c3a95aef779d308e743161d8959cf4437d3155bd19c645

data/README.md

@@ -38,9 +38,10 @@ To see a list of options for the generate command:
 
 Additional generators are available for existing projects generated using Hoboken:
 
-    $ hoboken add:metrics          # Add Rake tasks for metrics (flog, flay, simplecov)
-    $ hoboken add:i18n             # Internationalization support using sinatra-r18n
     $ hoboken add:heroku           # Heroku deployment support
+    $ hoboken add:i18n             # Internationalization support using sinatra-r18n
+    $ hoboken add:metrics          # Add metrics (flog, flay, simplecov)
+    $ hoboken add:omniauth         # OmniAuth authentication (allows you to select a provider)
     $ hoboken add:sprockets        # Rack-based asset packaging system
 
 ## Contributing

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :default => "test:unit"
+
+namespace :test do
+  Rake::TestTask.new(:unit) do |t|
+    t.libs << 'test/unit'
+    t.test_files = Dir["test/unit/**/*_test.rb"]
+  end
+end

data/lib/hoboken.rb

@@ -3,10 +3,122 @@ require "thor/util"
 require "fileutils"
 require_relative "hoboken/version"
 require_relative "hoboken/generate"
+require_relative "hoboken/actions"
 
 module Hoboken
+  class OmniAuth < Thor::Group
+    include Thor::Actions
+    include Hoboken::Actions
+
+    attr_reader :provider
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    def add_gem
+      @provider = ask("Specify a provider (i.e. twitter, facebook. etc.): ").downcase
+      provider_version = ask("Specify provider version: ")
+      gem gem_name, provider_version
+    end
+
+    def setup_middleware
+      insert_into_file("app.rb", after: /require "sinatra("|\/base")/) do
+        "\nrequire \"#{gem_name}\""
+      end
+
+      snippet = <<-CODE
+
+use OmniAuth::Builder do
+  provider :#{provider}, ENV["#{provider.upcase}_KEY"], ENV["#{provider.upcase}_SECRET"]
+end
+
+CODE
+
+      text = modular? ? indent(snippet, 4) : snippet
+      insert_into_file("app.rb", after: /use Rack::Session::Cookie.+\n/) { text }
+    end
+
+    def add_routes
+      routes = <<-CODE
+
+
+get "/login" do
+  '<a href="/auth/#{provider}">Login</a>'
+end
+
+get "/auth/:provider/callback" do
+  # TODO: Insert real authentication logic...
+  MultiJson.encode(request.env['omniauth.auth'])
+end
+
+get "/auth/failure" do
+  # TODO: Insert real error handling logic...
+  halt 401, params[:message]
+end
+CODE
+
+      if modular?
+        insert_into_file("app.rb", after: /get.+?end$/m) { indent(routes, 4) }
+      else
+        append_file("app.rb", routes)
+      end
+    end
+
+    def add_tests
+      inject_into_class("test/unit/app_test.rb", "AppTest") do
+<<-CODE
+  setup do
+    OmniAuth.config.test_mode = true
+  end
+
+  test "GET /login" do
+    get "/login"
+    assert_equal('<a href="/auth/#{provider}">Login</a>', last_response.body)
+  end
+
+  test "GET /auth/#{provider}/callback" do
+    auth_hash = {
+      "provider" => "#{provider}",
+      "uid" => "123545",
+      "info" => {
+        "name" => "John Doe"
+      }
+    }
+
+    OmniAuth.config.mock_auth[:#{provider}] = auth_hash
+    get "/auth/fitbit/callback"
+    assert_equal(MultiJson.encode(auth_hash), last_response.body)
+  end
+
+  test "GET /auth/failure" do
+    OmniAuth.config.mock_auth[:#{provider}] = :invalid_credentials
+    get "/auth/failure"
+    assert_response :not_authorized
+  end
+
+CODE
+      end
+    end
+
+    def reminders
+      say "\nGemfile updated... don't forget to 'bundle install'"
+    end
+
+    private
+
+    def gem_name
+      "omniauth-#{provider}"
+    end
+
+    def modular?
+      @modular ||= File.readlines("app.rb").grep(/Sinatra::Base/).any?
+    end
+  end
+
   class Sprockets < Thor::Group
     include Thor::Actions
+    include Hoboken::Actions
 
     def self.source_root
       File.dirname(__FILE__)
@@ -19,9 +131,9 @@ module Hoboken
     end
 
     def add_gems
-      append_file("Gemfile", "\ngem \"sprockets\", \"~> 2.10.0\", group: :assets")
-      append_file("Gemfile", "\ngem \"uglifier\", \"~> 2.1.1\", group: :assets")
-      append_file("Gemfile", "\ngem \"yui-compressor\", \"~> 0.9.6\", group: :assets")
+      gem "sprockets", "2.10.0", group: :assets
+      gem "uglifier", "2.1.1", group: :assets
+      gem "yui-compressor", "0.9.6", group: :assets
     end
 
     def copy_sprockets_helpers
@@ -107,13 +219,14 @@ TEXT
 
   class Heroku < Thor::Group
     include Thor::Actions
+    include Hoboken::Actions
 
     def self.source_root
       File.dirname(__FILE__)
     end
 
     def add_gem
-      append_file("Gemfile", "\ngem \"foreman\", \"~> 0.63.0\", group: :development")
+      gem "foreman", "0.63.0", group: :development
     end
 
     def procfile
@@ -157,13 +270,14 @@ TASK
 
   class Internationalization < Thor::Group
     include Thor::Actions
+    include Hoboken::Actions
 
     def self.source_root
       File.dirname(__FILE__)
     end
 
     def add_gem
-      append_file("Gemfile", "\ngem \"sinatra-r18n\", \"~> 1.1.5\"")
+      gem "sinatra-r18n", "1.1.5"
       insert_into_file("app.rb", after: /require "sinatra("|\/base")/) do
         "\nrequire \"sinatra/r18n\""
       end
@@ -184,15 +298,16 @@ TASK
 
   class Metrics < Thor::Group
     include Thor::Actions
+    include Hoboken::Actions
 
     def self.source_root
       File.dirname(__FILE__)
     end
 
     def add_gems
-      append_file("Gemfile", "\ngem \"flog\", \"~> 2.5.3\", group: :test")
-      append_file("Gemfile", "\ngem \"flay\", \"~> 1.4.3\", group: :test")
-      append_file("Gemfile", "\ngem \"simplecov\", \"~> 0.7.1\", require: false, group: :test")
+      gem "flog", "2.5.3", group: :test
+      gem "flay", "1.4.3", group: :test
+      gem "simplecov", "0.7.1", require: false, group: :test
     end
 
     def copy_task_templates
@@ -231,6 +346,7 @@ CODE
     register(Metrics, "add:metrics", "add:metrics", "Add metrics (flog, flay, simplecov)")
     register(Internationalization, "add:i18n", "add:i18n", "Internationalization support using sinatra-r18n")
     register(Heroku, "add:heroku", "add:heroku", "Heroku deployment support")
+    register(OmniAuth, "add:omniauth", "add:omniauth", "OmniAuth authentication (allows you to select a provider)")
     register(Sprockets, "add:sprockets", "add:sprockets", "Rack-based asset packaging system")
   end
 end

data/lib/hoboken/actions.rb

@@ -0,0 +1,16 @@
+module Hoboken
+  module Actions
+    def gem(name, version, opts={})
+      verbose = opts.has_key?(:verbose) ? opts.delete(:verbose) : true
+
+      parts = [name.inspect, "~> #{version}".inspect]
+      opts.each { |k, v| parts << "#{k}: #{v.inspect}" }
+
+      append_file("Gemfile", "\ngem #{parts.join(", ")}", verbose: verbose)
+    end
+
+    def indent(text, num_spaces)
+      text.gsub(/^/, 1.upto(num_spaces).map { |n| " " }.join)
+    end
+  end
+end

data/lib/hoboken/templates/test/support/rack_test_assertions.rb.tt

@@ -29,6 +29,30 @@ module Rack::Test::Assertions
     end
   end
 
+  def assert_has_session(message=nil)
+    msg = build_message(message, "expected a valid session")
+    assert_block(msg) do
+      last_request.env["rack.session"]
+    end
+  end
+
+  def assert_session_has_key(key, message=nil)
+    assert_has_session
+    msg = build_message(message, "expected session to have key named <?>", key)
+    assert_block(msg) do
+      last_request.env["rack.session"].keys.include?(key)
+    end
+  end
+
+  def assert_session(key, expected, message=nil)
+    assert_session_has_key(key)
+    actual = last_request.env["rack.session"][key]
+    msg = build_message(message, "expected session key <?> to be <?>, but was <?>", key, expected, actual)
+    assert_block(msg) do
+      expected == actual
+    end
+  end
+
   def assert_response(expected, message=nil)
     status = last_response.status
     msg = build_message(

data/lib/hoboken/templates/test/unit/app_test.rb.tt

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 class AppTest < Rack::Test::TestCase
   test "GET /" do

data/lib/hoboken/version.rb

@@ -1,3 +1,3 @@
 module Hoboken
-  VERSION = "0.0.1.beta"
+  VERSION = "0.0.1.beta2"
 end

data/test/fixtures/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+ruby "2.0.0"
+
+gem "sinatra", "~> 1.4.4", require: false, group: [:test, :development]

data/test/fixtures/Gemfile.pristine

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+ruby "2.0.0"

data/test/unit/hoboken_actions_test.rb

@@ -0,0 +1,129 @@
+require "test/unit"
+require_relative "../../lib/hoboken/actions.rb"
+
+module Hoboken
+  require "thor"
+  class Target < Thor::Group
+    include Thor::Actions
+    include Hoboken::Actions
+  end
+
+  class GemActionsTest < Test::Unit::TestCase
+    attr_reader :gemfile_path, :gemfile, :target
+
+    def setup
+      @gemfile_path = File.join("test", "fixtures")
+      @gemfile = File.join(gemfile_path, "Gemfile")
+      @target = Target.new([], {}, destination_root: gemfile_path)
+      FileUtils.copy(File.join(gemfile_path, "Gemfile.pristine"), gemfile)
+    end
+
+    def test_gem_appends_to_gemfile
+      target.gem "sinatra", "1.4.4", verbose: false
+      expected =
+        "source \"https://rubygems.org\"\n" +
+        "ruby \"2.0.0\"\n\n" +
+        "gem \"sinatra\", \"~> 1.4.4\""
+
+      assert_equal(expected, File.read(gemfile))
+    end
+
+    def test_gem_with_group
+      target.gem "sinatra", "1.4.4", group: :test, verbose: false
+      expected =
+        "source \"https://rubygems.org\"\n" +
+        "ruby \"2.0.0\"\n\n" +
+        "gem \"sinatra\", \"~> 1.4.4\", group: :test"
+
+      assert_equal(expected, File.read(gemfile))
+    end
+
+    def test_gem_with_multiple_groups
+      target.gem "sinatra", "1.4.4", group: [:test, :development], verbose: false
+      expected =
+        "source \"https://rubygems.org\"\n" +
+        "ruby \"2.0.0\"\n\n" +
+        "gem \"sinatra\", \"~> 1.4.4\", group: [:test, :development]"
+
+      assert_equal(expected, File.read(gemfile))
+    end
+
+    def test_gem_with_require
+      target.gem "sinatra", "1.4.4", require: false, verbose: false
+      expected =
+        "source \"https://rubygems.org\"\n" +
+        "ruby \"2.0.0\"\n\n" +
+        "gem \"sinatra\", \"~> 1.4.4\", require: false"
+
+      assert_equal(expected, File.read(gemfile))
+    end
+
+    def test_gem_with_require_and_group
+      target.gem "sinatra", "1.4.4", require: false, group: :test, verbose: false
+      expected =
+        "source \"https://rubygems.org\"\n" +
+        "ruby \"2.0.0\"\n\n" +
+        "gem \"sinatra\", \"~> 1.4.4\", require: false, group: :test"
+
+      assert_equal(expected, File.read(gemfile))
+    end
+
+    def test_gem_with_require_and_multiple_groups
+      target.gem "sinatra", "1.4.4", require: false, group: [:test, :development], verbose: false
+      expected =
+        "source \"https://rubygems.org\"\n" +
+        "ruby \"2.0.0\"\n\n" +
+        "gem \"sinatra\", \"~> 1.4.4\", require: false, group: [:test, :development]"
+
+      assert_equal(expected, File.read(gemfile))
+    end
+
+    def test_gem_multiple
+      target.gem "sinatra", "1.4.4", verbose: false
+      target.gem "thin", "1.4.4", verbose: false
+      expected =
+        "source \"https://rubygems.org\"\n" +
+        "ruby \"2.0.0\"\n\n" +
+        "gem \"sinatra\", \"~> 1.4.4\"\n" +
+        "gem \"thin\", \"~> 1.4.4\""
+
+      assert_equal(expected, File.read(gemfile))
+    end
+  end
+
+  class IndentActionsTest < Test::Unit::TestCase
+    attr_reader :text, :target
+
+    def setup
+      @target = Target.new
+      @text = <<-TEXT
+
+This is some
+text that needs
+to be indented.
+TEXT
+    end
+
+    def test_indent_with_one_space
+      expected = <<-TEXT
+ 
+ This is some
+ text that needs
+ to be indented.
+TEXT
+
+      assert_equal(expected, target.indent(text, 1))
+    end
+
+    def test_indent_with_two_spaces
+      expected = <<-TEXT
+  
+  This is some
+  text that needs
+  to be indented.
+TEXT
+
+      assert_equal(expected, target.indent(text, 2))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoboken
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta
+  version: 0.0.1.beta2
 platform: ruby
 authors:
 - Bob Nadler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,7 @@ files:
 - bin/hoboken
 - hoboken.gemspec
 - lib/hoboken.rb
+- lib/hoboken/actions.rb
 - lib/hoboken/generate.rb
 - lib/hoboken/templates/Gemfile.erb.tt
 - lib/hoboken/templates/README.md.tt
@@ -91,6 +92,9 @@ files:
 - lib/hoboken/templates/views/index.erb.tt
 - lib/hoboken/templates/views/layout.erb.tt
 - lib/hoboken/version.rb
+- test/fixtures/Gemfile
+- test/fixtures/Gemfile.pristine
+- test/unit/hoboken_actions_test.rb
 homepage: https://github.com/bnadlerjr/hoboken
 licenses:
 - MIT
@@ -115,4 +119,7 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Sinatra project generator.
-test_files: []
+test_files:
+- test/fixtures/Gemfile
+- test/fixtures/Gemfile.pristine
+- test/unit/hoboken_actions_test.rb