spree_cmd 1.0.0.rc2 → 1.0.0.rc3

data/lib/spree_cmd/installer.rb

@@ -33,7 +33,7 @@ module SpreeCmd
       @spree_gem_options = {}
 
       if options[:edge]
-        @spree_gem_options[:git] = 'https://github.com/spree/spree.git'
+        @spree_gem_options[:git] = 'git://github.com/spree/spree.git'
       elsif options[:path]
         @spree_gem_options[:path] = options[:path]
       elsif options[:git]
@@ -45,7 +45,6 @@ module SpreeCmd
     end
 
     def ask_questions
-      @install_blue_theme = ask_with_default("Would you like to install the default blue theme?")
       @install_default_gateways = ask_with_default("Would you like to install the default gateways?")
 
       if options[:skip_install_data]
@@ -62,6 +61,11 @@ module SpreeCmd
           @load_sample_data = false
         end
       end
+
+      if @load_seed_data
+        @admin_email = ask_string('Admin Email', 'spree@example.com', /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i)
+        @admin_password = ask_string('Admin Password', 'spree123', /^\S{5,32}$/)
+      end
     end
 
     def add_gems
@@ -69,20 +73,15 @@ module SpreeCmd
 
         gem :spree, @spree_gem_options
 
-        if @install_blue_theme
-          gem :spree_blue_theme, { :git => 'git://github.com/spree/spree_blue_theme.git',
-                                   :ref => '10666404ccb3ed4a4cc9cbe41e822ab2bb55112e' }
-        end
-
         if @install_default_gateways
           gem :spree_usa_epay, { :git => 'git://github.com/spree/spree_usa_epay.git',
                                  :ref => '0cb57b4afbf1eef6a0ad67a4a1ea506c6418fde1' }
 
           gem :spree_skrill, { :git => 'git://github.com/spree/spree_skrill.git',
-                               :ref => '6743bcbd0146d1c7145d6befc648005d8d0cf79a' }
+                               :ref => '37e6159aa71ec053499e2c7aa9cf799a3b3bdb39' }
         end
 
-        run 'bundle install'
+        run 'bundle install', :capture => true
       end
     end
 
@@ -92,9 +91,18 @@ module SpreeCmd
       spree_options << "--seed=#{@load_seed_data}"
       spree_options << "--sample=#{@load_sample_data}"
       spree_options << "--auto_accept" if options[:auto_accept]
+      spree_options << "--admin_email=#{@admin_email}" if @admin_email
+      spree_options << "--admin_password=#{@admin_password}" if @admin_password
+
+      inside @app_path do
+        run "rails generate spree:install #{spree_options.join(' ')}", :verbose => false
+      end
+    end
 
+    def precompile_assets
+      say_status :precompiling, "assets"
       inside @app_path do
-        run "rails generate spree:install #{spree_options.join(' ')}"
+        run 'bundle exec rake assets:precompile', :verbose => false
       end
     end
 
@@ -119,6 +127,17 @@ module SpreeCmd
       response.downcase[0] == ?y
     end
 
+    def ask_string(message, default, valid_regex=/\w/)
+      return default if options[:auto_accept]
+      valid = false
+      until valid
+        response = ask "#{message} [#{default}]"
+        response = default if response.empty?
+        valid = (response  =~ valid_regex)
+      end
+      response
+    end
+
     def create_rails_app
       say :create, @app_path
 

data/lib/spree_cmd/templates/extension/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) <%= Date.today.year %> [name of plugin creator]
+Copyright (c) <%= Time.now.year %> [name of plugin creator]
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/spree_cmd/templates/extension/README.md

@@ -18,4 +18,4 @@ Be sure to bundle your dependencies and then create a dummy test app for the spe
     $ bundle exec rake test app
     $ bundle exec rspec spec
 
-Copyright (c) <%= Date.today.year %> [name of extension creator], released under the New BSD License
+Copyright (c) <%= Time.now.year %> [name of extension creator], released under the New BSD License

data/lib/spree_cmd/templates/extension/config/routes.rb

@@ -1,3 +1,3 @@
-<%= class_name %>::Engine.routes.draw do
+Spree::Core::Engine.routes.draw do
   # Add your extension routes here
 end

data/lib/spree_cmd/templates/extension/spec/spec_helper.rb.tt

@@ -7,7 +7,7 @@ require 'rspec/rails'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f }
 
 # Requires factories defined in spree_core
 require 'spree/core/testing_support/factories'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cmd
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70095559783600 !ruby/object:Gem::Requirement
+  requirement: &70284221484100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70095559783600
+  version_requirements: *70284221484100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70095559782920 !ruby/object:Gem::Requirement
+  requirement: &70284221481540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,7 +35,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095559782920
+  version_requirements: *70284221481540
 description: tools to create new Spree stores and extensions
 email:
 - chris@spreecommerce.com
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 260406061965751448
+      hash: -1563334463560285860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: