picky-generators 4.6.3 → 4.6.4

data/lib/picky-generators/generators/all_in_one/sinatra.rb

@@ -22,6 +22,7 @@ module Picky
           create_target_directory
           copy_all_files
           copy_all_files expand_prototype_path('shared/server')
+          copy_all_files expand_prototype_path('shared/both')
           exclaim "\"#{name}\" is a great project name! Have fun :)\n"
           exclaim ""
           exclaim "Next steps:"

data/lib/picky-generators/generators/client/sinatra.rb

@@ -21,6 +21,7 @@ module Picky
           exclaim "Setting up Picky Sinatra Client \"#{name}\"."
           create_target_directory
           copy_all_files
+          copy_all_files expand_prototype_path('shared/both')
           exclaim "\"#{name}\" is a great project name! Have fun :)\n"
           exclaim ""
           exclaim "Next steps:"

data/lib/picky-generators/generators/server/sinatra.rb

@@ -22,6 +22,7 @@ module Picky
           create_target_directory
           copy_all_files
           copy_all_files expand_prototype_path('shared/server')
+          copy_all_files expand_prototype_path('shared/both')
           exclaim "\"#{name}\" is a great project name! Have fun :)\n"
           exclaim ""
           exclaim "Next steps:"

data/prototypes/{all_in_one/sinatra → shared/both}/book.rb

@@ -39,4 +39,4 @@ class Book
     "<li class='book'><h3><a href='http://google.com?q=#{@title}'>#{@title}</a></h3><em>#{@author}</em><p>#{@year}, #{@publisher}</p><p>#{@subjects}</p></li>"
   end
   
-end
+end

data/spec/lib/picky-generators/generators/client/sinatra_spec.rb

@@ -25,7 +25,7 @@ describe Picky::Generators::Client::Sinatra do
     it "should do things in order" do
       @sinatra.should_receive(:exclaim).twice.ordered # Initial explanation
       @sinatra.should_receive(:create_target_directory).once.ordered
-      @sinatra.should_receive(:copy_all_files).once.ordered
+      @sinatra.should_receive(:copy_all_files).twice.ordered
       @sinatra.should_receive(:exclaim).at_least(7).times.ordered # Some user steps to do
       
       @sinatra.generate

data/spec/lib/picky-generators/generators/server/sinatra_spec.rb

@@ -25,7 +25,7 @@ describe Picky::Generators::Server::Sinatra do
     it "should do things in order" do
       @sinatra.should_receive(:exclaim).once.ordered # Initial explanation
       @sinatra.should_receive(:create_target_directory).once.ordered
-      @sinatra.should_receive(:copy_all_files).twice.ordered
+      @sinatra.should_receive(:copy_all_files).exactly(3).times.ordered
       @sinatra.should_receive(:exclaim).at_least(8).times.ordered # Some user steps to do
 
       @sinatra.generate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky-generators
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.3
+        version: 4.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.3
+        version: 4.6.4
 - !ruby/object:Gem::Dependency
   name: picky-client
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.3
+        version: 4.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.3
+        version: 4.6.4
 description: Generators for Picky.
 email: florian.hanke+picky-generators@gmail.com
 executables:
@@ -74,7 +74,6 @@ files:
 - lib/picky-generators/generators/server/sinatra.rb
 - lib/picky-generators.rb
 - prototypes/all_in_one/sinatra/app.rb
-- prototypes/all_in_one/sinatra/book.rb
 - prototypes/all_in_one/sinatra/Gemfile
 - prototypes/all_in_one/sinatra/images/picky.png
 - prototypes/all_in_one/sinatra/javascripts/history.adapter.jquery.min.js
@@ -90,7 +89,6 @@ files:
 - prototypes/all_in_one/sinatra/stylesheets/picky.css
 - prototypes/all_in_one/sinatra/views/search.haml
 - prototypes/client/sinatra/app.rb
-- prototypes/client/sinatra/book.rb
 - prototypes/client/sinatra/config.ru
 - prototypes/client/sinatra/Gemfile
 - prototypes/client/sinatra/images/picky.png
@@ -107,14 +105,13 @@ files:
 - prototypes/client/sinatra/views/search.haml
 - prototypes/server/sinatra/app.rb
 - prototypes/server/sinatra/log/README
-- prototypes/server/sinatra/log/unicorn.stderr.log
-- prototypes/server/sinatra/log/unicorn.stdout.log
 - prototypes/server/sinatra/Rakefile
 - prototypes/server/sinatra/spec/integration_spec.rb
+- prototypes/shared/both/book.rb
+- prototypes/shared/both/data/development/library.csv
+- prototypes/shared/both/data/production/library.csv
+- prototypes/shared/both/data/test/library.csv
 - prototypes/shared/server/config.ru
-- prototypes/shared/server/data/development/library.csv
-- prototypes/shared/server/data/production/library.csv
-- prototypes/shared/server/data/test/library.csv
 - prototypes/shared/server/logging.rb
 - prototypes/shared/server/spec/spec_helper.rb
 - prototypes/shared/server/tmp/pids/README
@@ -153,3 +150,4 @@ test_files:
 - spec/lib/picky-generators/generators/client/sinatra_spec.rb
 - spec/lib/picky-generators/generators/selector_spec.rb
 - spec/lib/picky-generators/generators/server/sinatra_spec.rb
+has_rdoc: 

data/prototypes/client/sinatra/book.rb

@@ -1,42 +0,0 @@
-require 'csv'
-
-# A book is simple, it has just:
-#  * a title
-#  * an author
-#  * an isbn
-#  * a publishing year
-#  * a publisher
-#  * a number of subjects
-#
-class Book
-  
-  @@books_mapping = {}
-  
-  # Load the books on startup.
-  #
-  file_name = File.expand_path 'library.csv', File.dirname(__FILE__)
-  CSV.open(file_name, 'r').each do |row|
-    @@books_mapping[row.shift.to_i] = row
-  end
-  
-  # Find uses a lookup table.
-  #
-  def self.find ids, _ = {}
-    ids.map { |id| new(id, *@@books_mapping[id]) }
-  end
-  
-  attr_reader :id
-  
-  def initialize id, title, author, year, publisher, subjects
-    @id, @title, @author, @year, @publisher, @subjects = id, title, author, year, publisher, subjects
-  end
-  
-  # "Rendering" ;)
-  #
-  # Note: This is just an example. Please do not render in the model.
-  #
-  def to_s
-    "<li class='book'><h3><a href='http://google.com?q=#{@title}'>#{@title}</a></h3><em>#{@author}</em><p>#{@year}, #{@publisher}</p><p>#{@subjects}</p></li>"
-  end
-  
-end

data/prototypes/server/sinatra/log/unicorn.stderr.log

@@ -1,98 +0,0 @@
-I, [2011-08-07T19:44:32.570326 #13862]  INFO -- : listening on addr=0.0.0.0:8080 fd=5
-I, [2011-08-07T19:44:32.570869 #13862]  INFO -- : Refreshing Gem list
-worker=0 spawning...
-worker=1 spawning...
-worker=2 spawning...
-master process ready
-worker=0 spawned pid=13864
-worker=1 spawned pid=13865
-worker=0 ready
-worker=1 ready
-worker=2 spawned pid=13866
-worker=2 ready
-reaped #<Process::Status: pid 13866 exit 0> worker=2
-reaped #<Process::Status: pid 13865 exit 0> worker=1
-reaped #<Process::Status: pid 13864 exit 0> worker=0
-master complete
-I, [2011-08-07T19:45:29.818891 #13916]  INFO -- : listening on addr=0.0.0.0:8080 fd=5
-I, [2011-08-07T19:45:29.822904 #13916]  INFO -- : Refreshing Gem list
-worker=0 spawning...
-worker=1 spawning...
-worker=2 spawning...
-master process ready
-worker=0 spawned pid=13917
-worker=1 spawned pid=13918
-worker=1 ready
-worker=0 ready
-worker=2 spawned pid=13919
-worker=2 ready
-reaped #<Process::Status: pid 13919 exit 0> worker=2
-reaped #<Process::Status: pid 13918 exit 0> worker=1
-reaped #<Process::Status: pid 13917 exit 0> worker=0
-master complete
-I, [2011-08-07T19:47:59.882771 #14141]  INFO -- : listening on addr=0.0.0.0:8080 fd=5
-I, [2011-08-07T19:47:59.899987 #14141]  INFO -- : Refreshing Gem list
-worker=0 spawning...
-worker=1 spawning...
-worker=2 spawning...
-worker=0 spawned pid=14142
-worker=0 ready
-master process ready
-worker=1 spawned pid=14143
-worker=1 ready
-worker=2 spawned pid=14144
-worker=2 ready
-reaped #<Process::Status: pid 14144 exit 0> worker=2
-reaped #<Process::Status: pid 14143 exit 0> worker=1
-reaped #<Process::Status: pid 14142 exit 0> worker=0
-master complete
-I, [2011-08-07T19:48:25.294568 #14153]  INFO -- : listening on addr=0.0.0.0:8080 fd=5
-I, [2011-08-07T19:48:25.295306 #14153]  INFO -- : Refreshing Gem list
-worker=0 spawning...
-worker=1 spawning...
-worker=2 spawning...
-master process ready
-worker=0 spawned pid=14154
-worker=0 ready
-worker=1 spawned pid=14155
-worker=1 ready
-worker=2 spawned pid=14156
-worker=2 ready
-127.0.0.1 - - [07/Aug/2011 19:49:56] "GET /books?query=b HTTP/1.1" 200 59 0.2489
-127.0.0.1 - - [07/Aug/2011 19:49:56] "GET /books?query=b HTTP/1.1" 200 59 0.2517
-127.0.0.1 - - [07/Aug/2011 19:49:57] "GET /books?query=b HTTP/1.1" 200 59 0.1334
-127.0.0.1 - - [07/Aug/2011 19:49:57] "GET /books?query=b HTTP/1.1" 200 59 0.1352
-127.0.0.1 - - [07/Aug/2011 19:49:58] "GET /books?query=b HTTP/1.1" 200 58 0.0009
-127.0.0.1 - - [07/Aug/2011 19:49:58] "GET /books?query=b HTTP/1.1" 200 58 0.0015
-reaped #<Process::Status: pid 14156 exit 0> worker=2
-reaped #<Process::Status: pid 14155 exit 0> worker=1
-reaped #<Process::Status: pid 14154 exit 0> worker=0
-master complete
-I, [2011-08-07T19:51:12.474331 #14416]  INFO -- : listening on addr=0.0.0.0:8080 fd=5
-I, [2011-08-07T19:51:12.506839 #14416]  INFO -- : Refreshing Gem list
-worker=0 spawning...
-worker=1 spawning...
-worker=2 spawning...
-master process ready
-worker=0 spawned pid=14417
-worker=1 spawned pid=14418
-worker=0 ready
-worker=1 ready
-worker=2 spawned pid=14419
-worker=2 ready
-127.0.0.1 - - [07/Aug/2011 19:51:19] "GET /books?query=b HTTP/1.1" 200 204 0.1864
-127.0.0.1 - - [07/Aug/2011 19:51:19] "GET /books?query=b HTTP/1.1" 200 204 0.1890
-127.0.0.1 - - [07/Aug/2011 19:51:22] "GET /books?query=b HTTP/1.1" 200 204 0.1394
-127.0.0.1 - - [07/Aug/2011 19:51:22] "GET /books?query=b HTTP/1.1" 200 204 0.1415
-127.0.0.1 - - [07/Aug/2011 19:51:23] "GET /books?query=b HTTP/1.1" 200 204 0.0011
-127.0.0.1 - - [07/Aug/2011 19:51:23] "GET /books?query=b HTTP/1.1" 200 204 0.0018
-127.0.0.1 - - [07/Aug/2011 19:51:23] "GET /books?query=b HTTP/1.1" 200 204 0.0012
-127.0.0.1 - - [07/Aug/2011 19:51:23] "GET /books?query=b HTTP/1.1" 200 204 0.0025
-127.0.0.1 - - [07/Aug/2011 19:51:24] "GET /books?query=b HTTP/1.1" 200 204 0.0010
-127.0.0.1 - - [07/Aug/2011 19:51:24] "GET /books?query=b HTTP/1.1" 200 204 0.0017
-127.0.0.1 - - [07/Aug/2011 19:51:25] "GET /books?query=b HTTP/1.1" 200 204 0.0013
-127.0.0.1 - - [07/Aug/2011 19:51:25] "GET /books?query=b HTTP/1.1" 200 204 0.0023
-reaped #<Process::Status: pid 14419 exit 0> worker=2
-reaped #<Process::Status: pid 14418 exit 0> worker=1
-reaped #<Process::Status: pid 14417 exit 0> worker=0
-master complete

data/prototypes/server/sinatra/log/unicorn.stdout.log

@@ -1,62 +0,0 @@
-Loaded picky with environment 'development' in /Users/admin/temp/picky/generators/prototypes/server/sinatra on Ruby 1.9.2.
-Loaded picky with environment 'development' in /Users/admin/temp/picky/generators/prototypes/server/sinatra on Ruby 1.9.2.
-Loaded picky with environment 'development' in /Users/admin/temp/picky/generators/prototypes/server/sinatra on Ruby 1.9.2.
-Loaded picky with environment 'development' in /Users/admin/temp/picky/generators/prototypes/server/sinatra on Ruby 1.9.2.
-Loaded picky with environment 'development' in /Users/admin/temp/picky/generators/prototypes/server/sinatra on Ruby 1.9.2.
-19:51:13: "development:books:title": Starting serial data preparation.
-19:51:13: "development:books:title":   => /Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/prepared_title_index.txt.
-19:51:13: "development:books:title": Finished serial data preparation.
-19:51:13: "development:books:title:exact": Loading prepared data into memory.
-19:51:13: "development:books:title:exact": Caching from intermediate in-memory index.
-19:51:13: "development:books:title:partial": Generating partial index for index.
-19:51:13: "development:books:title:partial": Caching from intermediate in-memory index.
-19:51:13: "development:books:title:exact": Dumping data.
-19:51:13: "development:books:title:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/title_exact_inverted.json).
-19:51:13: "development:books:title:exact":   => Picky::Backend::File::Marshal(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/title_exact_similarity.dump).
-19:51:13: "development:books:title:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/title_exact_weights.json).
-19:51:13: "development:books:title:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/title_exact_configuration.json).
-19:51:13: "development:books:title:partial": Dumping data.
-19:51:13: "development:books:title:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/title_partial_inverted.json).
-19:51:13: "development:books:title:partial":   => Picky::Backend::File::Marshal(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/title_partial_similarity.dump).
-19:51:13: "development:books:title:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/title_partial_weights.json).
-19:51:13: "development:books:title:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/title_partial_configuration.json).
-19:51:13: "development:books:title": Caching finished.
-19:51:13: "development:books:author": Starting serial data preparation.
-19:51:13: "development:books:author":   => /Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/prepared_author_index.txt.
-19:51:13: "development:books:author": Finished serial data preparation.
-19:51:13: "development:books:author:exact": Loading prepared data into memory.
-19:51:13: "development:books:author:exact": Caching from intermediate in-memory index.
-19:51:13: "development:books:author:partial": Generating partial index for index.
-19:51:13: "development:books:author:partial": Caching from intermediate in-memory index.
-19:51:13: "development:books:author:exact": Dumping data.
-19:51:13: "development:books:author:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/author_exact_inverted.json).
-19:51:13: "development:books:author:exact":   => Picky::Backend::File::Marshal(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/author_exact_similarity.dump).
-19:51:13: "development:books:author:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/author_exact_weights.json).
-19:51:13: "development:books:author:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/author_exact_configuration.json).
-19:51:13: "development:books:author:partial": Dumping data.
-19:51:13: "development:books:author:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/author_partial_inverted.json).
-19:51:13: "development:books:author:partial":   => Picky::Backend::File::Marshal(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/author_partial_similarity.dump).
-19:51:13: "development:books:author:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/author_partial_weights.json).
-19:51:13: "development:books:author:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/author_partial_configuration.json).
-19:51:13: "development:books:author": Caching finished.
-19:51:13: "development:books:year": Starting serial data preparation.
-19:51:13: "development:books:year":   => /Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/prepared_year_index.txt.
-19:51:13: "development:books:year": Finished serial data preparation.
-19:51:13: "development:books:year:exact": Loading prepared data into memory.
-19:51:13: "development:books:year:exact": Caching from intermediate in-memory index.
-19:51:13: "development:books:year:partial": Generating partial index for index.
-19:51:13: "development:books:year:partial": Caching from intermediate in-memory index.
-19:51:13: "development:books:year:exact": Dumping data.
-19:51:13: "development:books:year:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/year_exact_inverted.json).
-19:51:13: "development:books:year:exact":   => Picky::Backend::File::Marshal(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/year_exact_similarity.dump).
-19:51:13: "development:books:year:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/year_exact_weights.json).
-19:51:13: "development:books:year:exact":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/year_exact_configuration.json).
-19:51:13: "development:books:year:partial": Dumping data.
-19:51:13: "development:books:year:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/year_partial_inverted.json).
-19:51:13: "development:books:year:partial":   => Picky::Backend::File::Marshal(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/year_partial_similarity.dump).
-19:51:13: "development:books:year:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/year_partial_weights.json).
-19:51:13: "development:books:year:partial":   => Picky::Backend::File::JSON(/Users/admin/temp/picky/generators/prototypes/server/sinatra/index/development/books/year_partial_configuration.json).
-19:51:13: "development:books:year": Caching finished.
-19:51:13: "development:books:title": Loading index from cache.
-19:51:13: "development:books:author": Loading index from cache.
-19:51:13: "development:books:year": Loading index from cache.