pliny 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05219e130e92ccf5c4feb4b920c66de370360c7b
-  data.tar.gz: 26b7dd30a5f8a886a4ab53394422208a8a3253ab
+  metadata.gz: cc0fc3ea6bd2bf5b8c5b6acdcf1cabf32ea781d5
+  data.tar.gz: 68bcfd4977381a765954e04884680dfaefdb5b4e
 SHA512:
-  metadata.gz: 8cd26e265b51c9aa36e6ceb2274a31d6efc5d5657c27b4687431b1dcf76b735a8faa040621af30faeeb1cd2f89076a939d6e2db792ce3079f63fa963d78a35db
-  data.tar.gz: cd22ef6dc41f8638c0a38e861fd6ca68e18f13a7f520ee5c806493bd8bb2512fb14ec7e53bec0314dddbce5c015f37d3f6b247ab8707ddc86357a327dd3f72f0
+  metadata.gz: 9a7c5e06960e5076cf66d5f3951acdba7e19152d1294dbc79c6946333f701bf574b9f520d0d3fe52256a5586cf8ebdb279870785f16e6db5b66d2601d880ff0c
+  data.tar.gz: 67a0baee927f357155076aa8466d4358abd1b0ef6d68dec6c9db69853db8b31ef042162a50b8945cad12965411dd41b697bd495ca70bb7accb3e8dcb3ce7e4e5

data/README.md

@@ -24,7 +24,7 @@ And gems/helpers to tie these together and support operations:
 - [Request IDs](lib/pliny/middleware/request_id.rb)
 - [RequestStore](http://brandur.org/antipatterns), thread safe option to store data with the current request
 - [Sequel](http://sequel.jeremyevans.net/) for ORM
-- [Sequel-PG](https://github.com/jeremyevans/sequel_pg) because we don't like mysql
+- [Sequel-PG](https://github.com/jeremyevans/sequel_pg) to talk to the world's most advanced open source database
 - [Versioning](lib/pliny/middleware/versioning.rb) to allow versioning your API in the HTTP Accept header
 
 ## Getting started
@@ -112,8 +112,6 @@ Pliny comes with several rake tasks:
 rake db:create        # Create the database
 rake db:drop          # Drop the database
 rake db:migrate       # Run database migrations
-rake db:nuke          # Nuke the database (drop all tables)
-rake db:reset         # Reset the database
 rake db:rollback      # Rollback the database
 rake db:schema:dump   # Dump the database schema
 rake db:schema:load   # Load the database schema
@@ -135,6 +133,13 @@ $ foreman run bin/run 'puts "hello world"'  # Run automated code
 
 (hint: don't forget `foreman run` in development)
 
+### Updating
+
+Use `pliny-update` to update the Pliny app in the current directory.
+
+This not only bumps the version dependency, but also applies any changes that happened in the template app (for instance: new initializer, tweaks in the base endpoint, etc).
+
+
 ## Development
 
 Run tests:

data/bin/pliny-update

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require "optparse"
+require_relative '../lib/pliny/commands/updater'
+
+Pliny::Commands::Updater.run

data/lib/pliny/commands/generator.rb

@@ -23,8 +23,8 @@ module Pliny::Commands
       md.create_test
     end
 
-    desc 'migration NAME', 'Generates a migration'
-    def migration(name)
+    desc 'migration [NAME]', 'Generates a migration'
+    def migration(*name)
       require_relative 'generator/migration'
 
       mg = Migration.new(name, options)

data/lib/pliny/commands/generator/migration.rb

@@ -3,11 +3,24 @@ require_relative 'base'
 module Pliny::Commands
   class Generator
     class Migration < Base
+      def initialize(name, options = {}, stream = $stdout)
+        super
+        @name = normalize_name(name)
+      end
+
       def create
         migration = "./db/migrate/#{Time.now.to_i}_#{name}.rb"
         write_template('migration.erb', migration)
         display "created migration #{migration}"
       end
+
+      private
+
+      def normalize_name(name)
+        Array(name).map(&:underscore)
+                   .map { |n| n.tr(' ', '_') }
+                   .join('_')
+      end
     end
   end
 end

data/lib/pliny/commands/updater.rb

@@ -0,0 +1,86 @@
+require 'fileutils'
+require 'pathname'
+require 'pliny/version'
+require 'uri'
+
+module Pliny::Commands
+  class Updater
+    attr_accessor :stream
+
+    def self.run(stream = $stdout)
+      new(stream).run!
+    end
+
+    def initialize(stream = $stdout)
+      @stream = stream
+    end
+
+    def run!
+      unless File.exist?("Gemfile.lock")
+        abort("Pliny app not found - looking for Gemfile.lock")
+      end
+
+      version_current = get_current_version
+      version_target  = Gem::Version.new(Pliny::VERSION)
+
+      if version_current == version_target
+        display "Version #{version_current} is current, nothing to update."
+      elsif version_current > version_target
+        display "pliny-update is outdated. Please update it with `gem install pliny` or similar."
+      else
+        display "Updating from #{version_current} to #{version_target}..."
+        ensure_repo_available
+        save_patch(version_current, version_target)
+        exec_patch
+      end
+    end
+
+    # we need a local copy of the pliny repo to produce a diff
+    def ensure_repo_available
+      if File.exists?(repo_dir)
+        unless system("cd #{repo_dir} && git fetch --tags")
+          abort("Could not update Pliny repo at #{repo_dir}")
+        end
+      else
+        unless system("git clone https://github.com/interagent/pliny.git #{repo_dir}")
+          abort("Could not git clone the Pliny repo")
+        end
+      end
+    end
+
+    def get_current_version
+      File.read("./Gemfile.lock").split("\n").each do |line|
+        next unless pliny_version = line.match(/pliny \(([\d+\.]+)\)/)
+        return Gem::Version.new(pliny_version[1])
+      end
+    end
+
+    def save_patch(curr, target)
+      # take a diff of changes that happened to the template app in Pliny
+      diff = `cd #{repo_dir} && git diff v#{curr}..v#{target} lib/template/`
+
+      # remove lib/template from the path of files in the patch so that we can
+      # apply these to the current folder
+      diff.gsub!(/^(\-\-\-|\+\+\+) (\w)\/lib\/template/, '\1 \2')
+
+      File.open(patch_file, "w") { |f| f.puts diff }
+    end
+
+    def exec_patch
+      # throw .orig and .rej files in /tmp, they're useless with source control
+      exec "patch --prefix=/tmp/ --reject-file=/tmp/pliny-reject -p1 < #{patch_file}"
+    end
+
+    def display(msg)
+      stream.puts msg
+    end
+
+    def repo_dir
+      File.join(Dir.home, ".tmp/pliny-repo")
+    end
+
+    def patch_file
+      File.join(repo_dir, "pliny-update.patch")
+    end
+  end
+end

data/lib/pliny/tasks/db.rake

@@ -31,18 +31,6 @@ namespace :db do
     end
   end
 
-  desc "Nuke the database (drop all tables)"
-  task :nuke do
-    database_urls.each do |database_url|
-      db = Sequel.connect(database_url)
-      db.tables.each do |table|
-        db.run(%{DROP TABLE "#{table}" CASCADE})
-      end
-      puts "Nuked `#{name_from_uri(database_url)}`"
-    end
-    disconnect
-  end
-
   desc "Seed the database with data"
   task :seed do
     if File.exist?('./db/seeds.rb')
@@ -54,9 +42,6 @@ namespace :db do
     end
   end
 
-  desc "Reset the database"
-  task :reset => [:nuke, :migrate, :seed]
-
   desc "Create the database"
   task :create do
     database_urls.each do |database_url|

data/lib/pliny/templates/model.erb

@@ -1,5 +1,5 @@
 class <%= singular_class_name %> < Sequel::Model
-  plugin :timestamps
+  plugin :timestamps, update_on_create: true
 <% if paranoid %>
   plugin :paranoid
 <% end %>

data/lib/pliny/templates/model_migration.erb

@@ -6,7 +6,7 @@ Sequel.migration do
 <% if paranoid %>
       timestamptz  :deleted_at
 <% end %>
-      timestamptz  :updated_at
+      timestamptz  :updated_at, default: Sequel.function(:now), null: false
     end
   end
 end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/lib/template/Gemfile

@@ -1,10 +1,10 @@
 source "https://rubygems.org"
-ruby "2.2.1"
+ruby "2.2.2"
 
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.8"
+gem "pliny", "~> 0.9"
 gem "pry"
 gem "puma", "~> 2.10"
 gem "rack-ssl"

data/lib/template/Procfile

@@ -1 +1,2 @@
 web: bundle exec puma --config config/puma.rb config.ru
+console: bundle exec bin/console

data/lib/template/lib/initializer.rb

@@ -33,8 +33,7 @@ module Initializer
   end
 
   def self.require!(globs)
-    globs = [globs] unless globs.is_a?(Array)
-    globs.each do |f|
+    Array(globs).each do |f|
       Pliny::Utils.require_glob("#{Config.root}/#{f}.rb")
     end
   end

data/lib/template/lib/mediators/base.rb

@@ -1,4 +1,4 @@
-class Mediators
+module Mediators
   class Base
     def self.run(options={})
       new(options).call

data/lib/template/lib/routes.rb

@@ -1,8 +1,8 @@
 Routes = Rack::Builder.new do
   use Rollbar::Middleware::Sinatra
-  use Pliny::Middleware::RescueErrors, raise: Config.raise_errors?
   use Pliny::Middleware::CORS
   use Pliny::Middleware::RequestID
+  use Pliny::Middleware::RescueErrors, raise: Config.raise_errors?
   use Pliny::Middleware::RequestStore, store: Pliny::RequestStore
   use Rack::Timeout if Config.timeout > 0
   use Pliny::Middleware::Versioning,

data/lib/template/lib/serializers/base.rb

@@ -1,4 +1,4 @@
-class Serializers
+module Serializers
   class Base
     @@structures = {}
 

data/spec/commands/generator/migration_spec.rb

@@ -0,0 +1,19 @@
+require 'pliny/commands/generator'
+require 'pliny/commands/generator/migration'
+require 'spec_helper'
+
+describe Pliny::Commands::Generator::Migration do
+  describe '#name' do
+    it 'generates a migration name given differents argument formats' do
+      [
+        %w(add column foo to barz),
+        'add column foo to barz',
+        'add_column_foo_to_barz',
+        'AddColumnFooToBarz'
+      ].each do |argument|
+        actual = described_class.new(argument, {}, StringIO.new).name
+        assert_equal 'add_column_foo_to_barz', actual
+      end
+    end
+  end
+end

data/spec/commands/updater_spec.rb

@@ -0,0 +1,29 @@
+require 'pliny/commands/updater'
+require 'spec_helper'
+
+describe Pliny::Commands::Updater do
+  before do
+    @io = StringIO.new
+    @cmd = Pliny::Commands::Updater.new(@io)
+
+    stub(@cmd).exec_patch
+  end
+
+  describe "#run!" do
+    before do
+      FileUtils.rm_rf("/tmp/plinytest")
+      FileUtils.mkdir_p("/tmp/plinytest")
+      Dir.chdir("/tmp/plinytest")
+      File.open("/tmp/plinytest/Gemfile.lock", "w") do |f|
+        f.puts "    pliny (0.6.3)"
+      end
+    end
+
+    it "creates a patch with Pliny diffs between the two versions" do
+      @cmd.run!
+      patch = File.read(@cmd.patch_file)
+      assert patch.include?('--- a/Gemfile')
+      assert patch.include?('-gem "pliny", "~> 0.6"')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -51,26 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: prmd
   requirement: !ruby/object:Gem::Requirement
@@ -105,26 +85,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -339,6 +299,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.0
 description: Pliny is a set of base classes and helpers to help developers write excellent
   APIs in Sinatra
 email:
@@ -347,12 +347,14 @@ email:
 executables:
 - pliny-generate
 - pliny-new
+- pliny-update
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/pliny-generate
 - bin/pliny-new
+- bin/pliny-update
 - lib/pliny.rb
 - lib/pliny/commands/creator.rb
 - lib/pliny/commands/generator.rb
@@ -363,6 +365,7 @@ files:
 - lib/pliny/commands/generator/model.rb
 - lib/pliny/commands/generator/schema.rb
 - lib/pliny/commands/generator/serializer.rb
+- lib/pliny/commands/updater.rb
 - lib/pliny/config_helpers.rb
 - lib/pliny/db_support.rb
 - lib/pliny/errors.rb
@@ -433,8 +436,10 @@ files:
 - spec/commands/creator_spec.rb
 - spec/commands/generator/base_spec.rb
 - spec/commands/generator/endpoint_spec.rb
+- spec/commands/generator/migration_spec.rb
 - spec/commands/generator/schema_spec.rb
 - spec/commands/generator_spec.rb
+- spec/commands/updater_spec.rb
 - spec/db_support_spec.rb
 - spec/errors_spec.rb
 - spec/extensions/instruments_spec.rb