picky-generators 1.1.1 → 1.1.2

data/lib/picky-generators/generators/base.rb

@@ -21,7 +21,11 @@ module Picky
       def initialize identifier, name, prototype_path, *args
         @identifier        = identifier
         @name              = name
-        @prototype_basedir = File.expand_path "../../../../prototypes/#{prototype_path}", __FILE__
+        @prototype_basedir = expand_prototype_path prototype_path
+      end
+      
+      def expand_prototype_path prototype_path
+        File.expand_path "../../../../prototypes/#{prototype_path}", __FILE__
       end
       
       #
@@ -40,19 +44,19 @@ module Picky
       def copy_all_files from = nil
         all_prototype_files(from).each do |filename|
           next if filename.match(/\.textile$/)
-          copy_single_file filename
+          copy_single_file filename, from
         end
       end
 
       #
       #
-      def target_filename_for filename
-        filename.gsub(%r{#{prototype_basedir}}, target_directory)
+      def target_filename_for filename, from = nil
+        filename.gsub(%r{#{from || prototype_basedir}}, target_directory)
       end
       #
       #
-      def copy_single_file filename
-        target = target_filename_for filename
+      def copy_single_file filename, from = nil
+        target = target_filename_for filename, from
         if File.exists? target
           exists target
         else

data/lib/picky-generators/generators/selector.rb

@@ -10,8 +10,9 @@ module Picky
 
       def initialize
         @types = {
-          :sinatra_client => [Client::Sinatra, :sinatra_project_name],
-          :unicorn_server => [Server::Unicorn, :unicorn_project_name]
+          :sinatra_client       => [Client::Sinatra, :sinatra_client_name],
+          :unicorn_server       => [Server::Unicorn, :unicorn_server_name],
+          :empty_unicorn_server => [Server::EmptyUnicorn, :empty_unicorn_server_name] 
         }
       end
 

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

@@ -0,0 +1,40 @@
+module Picky
+
+  module Generators
+  
+    module Server
+
+      # Generates a new empty Picky Unicorn Server.
+      #
+      # Example:
+      #   > picky-generate unicorn_server my_lovely_unicorn
+      #
+      class EmptyUnicorn < Picky::Generators::Base
+        
+        def initialize identifier, name, *args
+          super identifier, name, 'server/empty_unicorn', *args
+        end
+  
+        #
+        #
+        def generate
+          exclaim "Setting up Picky Unicorn Server \"#{name}\"."
+          create_target_directory
+          copy_all_files expand_prototype_path('server/shared_unicorn')
+          copy_all_files
+          exclaim "\"#{name}\" is a great project name! Have fun :)\n"
+          exclaim ""
+          exclaim "Next steps:"
+          exclaim "1. cd #{name}"
+          exclaim "2. bundle install"
+          exclaim "3. rake           # (optional) shows you where Picky needs input from you"
+          exclaim "                  #            if you want to define your own search."
+        end
+        
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -4,7 +4,7 @@ module Picky
   
     module Server
 
-      # Generates a new Picky Unicorn Server.
+      # Generates a new Picky Unicorn Server Example.
       #
       # Example:
       #   > picky-generate unicorn_server my_lovely_unicorn
@@ -20,6 +20,7 @@ module Picky
         def generate
           exclaim "Setting up Picky Unicorn Server \"#{name}\"."
           create_target_directory
+          copy_all_files expand_prototype_path('server/shared_unicorn')
           copy_all_files
           exclaim "\"#{name}\" is a great project name! Have fun :)\n"
           exclaim ""

data/lib/picky-generators.rb

@@ -3,5 +3,6 @@ require File.expand_path '../picky-generators/generators/not_found_exception', _
 require File.expand_path '../picky-generators/generators/base', __FILE__
 require File.expand_path '../picky-generators/generators/client/sinatra', __FILE__
 require File.expand_path '../picky-generators/generators/server/unicorn', __FILE__
+require File.expand_path '../picky-generators/generators/server/empty_unicorn', __FILE__
 
 require File.expand_path '../picky-generators/generators/selector', __FILE__

data/prototypes/server/empty_unicorn/app/application.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+#
+# Check the Wiki http://github.com/floere/picky/wiki for more options.
+# Ask me or the google group if you have questions or specific requests.
+#
+class PickySearch < Application
+  
+  # TODO Your search configuration here.
+  
+end

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

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Florian Hanke
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 1
         - 1
-        - 1
-        version: 1.1.1
+        - 2
+        version: 1.1.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,8 +56,8 @@ dependencies:
         segments: 
         - 1
         - 1
-        - 1
-        version: 1.1.1
+        - 2
+        version: 1.1.2
   type: :runtime
   version_requirements: *id003
 description: Generators for Picky.
@@ -73,6 +73,7 @@ files:
 - lib/picky-generators/generators/client/sinatra.rb
 - lib/picky-generators/generators/not_found_exception.rb
 - lib/picky-generators/generators/selector.rb
+- lib/picky-generators/generators/server/empty_unicorn.rb
 - lib/picky-generators/generators/server/unicorn.rb
 - lib/picky-generators.rb
 - prototypes/client/sinatra/app.rb
@@ -90,19 +91,20 @@ files:
 - prototypes/client/sinatra/stylesheets/stylesheet.sass
 - prototypes/client/sinatra/views/configure.haml
 - prototypes/client/sinatra/views/search.haml
+- prototypes/server/empty_unicorn/app/application.rb
+- prototypes/server/shared_unicorn/app/db.yml
+- prototypes/server/shared_unicorn/app/logging.rb
+- prototypes/server/shared_unicorn/app/README
+- prototypes/server/shared_unicorn/config.ru
+- prototypes/server/shared_unicorn/Gemfile
+- prototypes/server/shared_unicorn/log/README
+- prototypes/server/shared_unicorn/Rakefile
+- prototypes/server/shared_unicorn/script/console
+- prototypes/server/shared_unicorn/tmp/pids/README
+- prototypes/server/shared_unicorn/tmp/README
+- prototypes/server/shared_unicorn/unicorn.ru
 - prototypes/server/unicorn/app/application.rb
-- prototypes/server/unicorn/app/db.yml
 - prototypes/server/unicorn/app/library.csv
-- prototypes/server/unicorn/app/logging.rb
-- prototypes/server/unicorn/app/README
-- prototypes/server/unicorn/config.ru
-- prototypes/server/unicorn/Gemfile
-- prototypes/server/unicorn/log/README
-- prototypes/server/unicorn/Rakefile
-- prototypes/server/unicorn/script/console
-- prototypes/server/unicorn/tmp/pids/README
-- prototypes/server/unicorn/tmp/README
-- prototypes/server/unicorn/unicorn.ru
 - spec/lib/picky-generators/generators/base_spec.rb
 - spec/lib/picky-generators/generators/client/sinatra_spec.rb
 - spec/lib/picky-generators/generators/selector_spec.rb