spree_cmd 1.1.1 → 1.1.2.rc1

data/lib/spree_cmd/extension.rb

@@ -51,7 +51,7 @@ module SpreeCmd
       end
 
       def spree_version
-        '1.1.1'
+        '1.1.2.rc1'
       end
 
       def use_prefix(prefix)

data/lib/spree_cmd/installer.rb

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 module SpreeCmd
 
   class Installer < Thor::Group
@@ -26,9 +28,16 @@ module SpreeCmd
                  :desc => 'Precompile spree assets to public/assets'
 
     def verify_rails
-      unless is_rails_project?
+      unless rails_project?
         say "#{@app_path} is not a rails project."
-        exit(1)
+        exit 1
+      end
+    end
+
+    def verify_image_magick
+      unless image_magick_installed?
+        say "Image magick must be installed."
+        exit 1
       end
     end
 
@@ -71,7 +80,7 @@ module SpreeCmd
         @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
-      @precompile_assets = options[:precompile_assets] ? ask_with_default('Would you like to precompile assets?') : false
+      @precompile_assets = options[:precompile_assets] && ask_with_default('Would you like to precompile assets?')
     end
 
     def add_gems
@@ -139,7 +148,7 @@ module SpreeCmd
         until valid
           response = ask "#{message} [#{default}]"
           response = default if response.empty?
-          valid = (response  =~ valid_regex)
+          valid = (valid_regex === response)
         end
         response
       end
@@ -148,17 +157,32 @@ module SpreeCmd
         say :create, @app_path
 
         rails_cmd = "rails new #{@app_path} --skip-bundle"
-        if options[:template]
-          rails_cmd += " -m #{options[:template]}"
-        end
-        if options[:database]
-          rails_cmd += " -d #{options[:database]}"
-        end
+        rails_cmd << " -m #{options[:template]}" if options[:template]
+        rails_cmd << " -d #{options[:database]}" if options[:database]
         run(rails_cmd)
       end
 
-      def is_rails_project?
+      def rails_project?
         File.exists? File.join(@app_path, 'script', 'rails')
       end
+
+      def linux?
+        /linux/i === RbConfig::CONFIG['host_os']
+      end
+
+      def mac?
+        /darwin/i === RbConfig::CONFIG['host_os']
+      end
+
+      def windows?
+        %r{msdos|mswin|djgpp|mingw} === RbConfig::CONFIG['host_os']
+      end
+
+      def image_magick_installed?
+        # true if command executed succesfully
+        # false for non zero exit status
+        # nil if command execution fails
+        system('identify -version')
+      end
   end
 end

data/lib/spree_cmd/templates/extension/lib/%file_name%/engine.rb.tt

@@ -1,7 +1,8 @@
 module <%= class_name %>
   class Engine < Rails::Engine
-    engine_name '<%= file_name %>'
+    require 'spree/core'
     isolate_namespace Spree
+    engine_name '<%= file_name %>'
 
     config.autoload_paths += %W(#{config.root}/lib)
 

data/lib/spree_cmd/templates/extension/lib/generators/%file_name%/install/install_generator.rb.tt

@@ -21,7 +21,7 @@ module <%= class_name %>
          if res == '' || res.downcase == 'y'
            run 'bundle exec rake db:migrate'
          else
-           puts 'Skiping rake db:migrate, don\'t forget to run it!'
+           puts 'Skipping rake db:migrate, don\'t forget to run it!'
          end
       end
     end

data/spree_cmd.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'rspec'
+  # Temporary hack until https://github.com/wycats/thor/issues/234 is fixed
+  s.add_dependency 'thor', '0.14.6'
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: spree_cmd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Chris Mar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70184006757120 !ruby/object:Gem::Requirement
+  requirement: &70189203150080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184006757120
+  version_requirements: *70189203150080
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70189203149140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.14.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *70189203149140
 description: tools to create new Spree stores and extensions
 email:
 - chris@spreecommerce.com
@@ -75,16 +86,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1521068613993842786
+      hash: -4114835332715602194
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1521068613993842786
+      version: 1.3.1
 requirements: []
 rubyforge_project: spree_cmd
 rubygems_version: 1.8.10