spree_cmd 4.1.0.rc3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90215d72b3377069857274b0681839c2db86159c5da3a0d5b5b4010155f7ba6
-  data.tar.gz: b1a0149b53628b34a8c9272e0c7b71b6ebc9acbc6a8dae052627ab7a4c5cc58a
+  metadata.gz: 2b4c4779e163ba3a0008266518ac9c1e758c600147479248c84385ecf75d0cd4
+  data.tar.gz: 27dc250aa4d562971b3a47a6deac27b85df4499adc1208b720598ed7d39accb3
 SHA512:
-  metadata.gz: d55011895bea73fca67ce956632ec8810814cc68ee88a108338bc3001879309877c36b8e620f6b327f39a0da9f6bf15de5073584701c67407fb4ff36c96574e5
-  data.tar.gz: 24987d514b0878f82f243fc308874db0daaa3738044030f002199765482a90d774bc6ce670ec4db589b86d42bb14a0637cdc8f71d35728d4746cdfd71f8d4f26
+  metadata.gz: de60c038215efb69c3fc5ffd0288ad3f4f7945630279d30c8243f21a91c886fd950136938fa4af7fa1068273449e6ca01ce11e5fc66d19f0064a5f0a5f2dc27b
+  data.tar.gz: fa570c5b302e55961367244d6fa4d4eb82a95be379862d2ba2f781a3f839ecf724a96fb3657b7946f888b340cbc1eda09b897a431bbcf7f4394df946c889e5f3

data/lib/spree_cmd/templates/extension/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   Include:
     - '**/Gemfile'
     - '**/Rakefile'

data/lib/spree_cmd/templates/extension/Appraisals

@@ -1,28 +1,24 @@
-appraise 'spree-3-5' do
-  gem 'spree_core', '~> 3.5.0'
-  gem 'spree_backend', '~> 3.5.0'
-  gem 'spree_auth_devise', '~> 3.4.0'
-  gem 'rails-controller-testing'
-end
-
 appraise 'spree-3-7' do
-  gem 'spree_core', '~> 3.7.0'
-  gem 'spree_backend', '~> 3.7.0'
+  gem 'spree', '~> 3.7.0'
   gem 'spree_auth_devise', '~> 3.5.0'
   gem 'rails-controller-testing'
   gem 'sass-rails'
 end
 
 appraise 'spree-4-0' do
-  gem 'spree_core', '~> 4.0.0'
-  gem 'spree_backend', '~> 4.0.0'
-  gem 'spree_auth_devise', '~> 4.0'
+  gem 'spree', '~> 4.0.0'
+  gem 'spree_auth_devise', '~> 4.0.0'
+  gem 'rails-controller-testing'
+end
+
+appraise 'spree-4-1' do
+  gem 'spree', '~> 4.1.0'
+  gem 'spree_auth_devise', '~> 4.1.0'
   gem 'rails-controller-testing'
 end
 
 appraise 'spree-master' do
-  gem 'spree_core', github: 'spree/spree', branch: 'master'
-  gem 'spree_backend', github: 'spree/spree', branch: 'master'
+  gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
   gem 'rails-controller-testing'
 end

data/lib/spree_cmd/templates/extension/Gemfile

@@ -5,8 +5,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'spree_core', github: 'spree/spree', branch: 'master'
-gem 'spree_backend', github: 'spree/spree', branch: 'master'
+gem 'spree', github: 'spree/spree', branch: 'master'
 # Provides basic authentication functionality for testing parts of your engine
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
 gem 'rails-controller-testing'

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

@@ -5,19 +5,22 @@ Introduction goes here.
 ## Installation
 
 1. Add this extension to your Gemfile with this line:
-  ```ruby
-  gem '<%= file_name %>', github: '[your-github-handle]/<%= file_name %>'
-  ```
 
-2. Install the gem using Bundler:
-  ```ruby
-  bundle install
-  ```
+    ```ruby
+    gem '<%= file_name %>', github: '[your-github-handle]/<%= file_name %>'
+    ```
+
+2. Install the gem using Bundler
+
+    ```ruby
+    bundle install
+    ```
 
 3. Copy & run migrations
-  ```ruby
-  bundle exec rails g <%= file_name %>:install
-  ```
+
+    ```ruby
+    bundle exec rails g <%= file_name %>:install
+    ```
 
 4. Restart your server
 
@@ -39,7 +42,6 @@ Simply add this require statement to your spec_helper:
 require '<%= file_name %>/factories'
 ```
 
-
 ## Contributing
 
 If you'd like to contribute, please take a look at the

data/lib/spree_cmd/templates/extension/extension.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
 
   spree_version = '>= 3.2.0', '< 5.0'
   s.add_dependency 'spree_core', spree_version
+  s.add_dependency 'spree_api', spree_version
   s.add_dependency 'spree_backend', spree_version
   s.add_dependency 'spree_extension'
 
@@ -32,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'capybara-screenshot'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_bot', '~> 4.7'
+  s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'pg'
@@ -41,5 +42,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'webdrivers', '~> 4.0.0'
+  s.add_development_dependency 'webdrivers'
 end

data/lib/spree_cmd/templates/extension/gemfiles/spree_3_7.gemfile

@@ -3,8 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
-gem 'spree_core', '~> 3.7.0'
-gem 'spree_backend', '~> 3.7.0'
+gem 'spree', '~> 3.7.0'
 gem 'spree_auth_devise', '~> 3.5.0'
 gem 'sass-rails'
 

data/lib/spree_cmd/templates/extension/gemfiles/spree_4_0.gemfile

@@ -3,8 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
-gem 'spree_core', '~> 4.0.0'
-gem 'spree_backend', '~> 4.0.0'
-gem 'spree_auth_devise', '~> 4.0'
+gem 'spree', '~> 4.0.0'
+gem 'spree_auth_devise', '~> 4.0.0'
 
 gemspec path: '../'

data/lib/spree_cmd/templates/extension/gemfiles/{spree_3_5.gemfile → spree_4_1.gemfile}

@@ -3,8 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
-gem 'spree_core', '~> 3.5.0'
-gem 'spree_backend', '~> 3.5.0'
-gem 'spree_auth_devise', '~> 3.4.0'
+gem 'spree', '~> 4.1.0'
+gem 'spree_auth_devise', '~> 4.1.0'
 
 gemspec path: '../'

data/lib/spree_cmd/templates/extension/gemfiles/spree_master.gemfile

@@ -3,8 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
-gem 'spree_core', github: 'spree/spree', branch: 'master'
-gem 'spree_backend', github: 'spree/spree', branch: 'master'
+gem 'spree', github: 'spree/spree', branch: 'master'
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
 
 gemspec path: '../'

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

@@ -3,14 +3,6 @@ module <%= class_name %>
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
 
-      def add_javascripts
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/<%= file_name %>\n"
-      end
-
-      def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/<%= file_name %>\n", before: %r{\*\/}, verbose: true
-      end
-
       def add_migrations
         run 'bundle exec rake railties:install:migrations FROM=<%= file_name %>'
       end
@@ -18,9 +10,9 @@ module <%= class_name %>
       def run_migrations
         run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
         if run_migrations
-          run 'bundle exec rake db:migrate'
+          run 'bundle exec rails db:migrate'
         else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+          puts 'Skipping rails db:migrate, don\'t forget to run it!'
         end
       end
     end

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

@@ -7,6 +7,7 @@ SimpleCov.start do
   add_group 'Mailers', 'app/mailers'
   add_group 'Models', 'app/models'
   add_group 'Views', 'app/views'
+  add_group 'Services', 'app/services'
   add_group 'Libraries', 'lib/spree'
 end
 
@@ -28,7 +29,15 @@ require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/capybara_ext'
 require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/factories'
+require 'spree/testing_support/preferences'
+require 'spree/testing_support/flash'
 require 'spree/testing_support/url_helpers'
+require 'spree/testing_support/order_walkthrough'
+require 'spree/testing_support/caching'
+
+# API v2 helpers
+require 'spree/api/testing_support/v2/base'
+require 'spree/api/testing_support/v2/current_order'
 
 RSpec.configure do |config|
   # Infer an example group's spec type from the file location.
@@ -63,4 +72,28 @@ RSpec.configure do |config|
 
   config.fail_fast = ENV['FAIL_FAST'] || false
   config.order = 'random'
+
+  config.before :each do
+    Rails.cache.clear
+    reset_spree_preferences do |config|
+      # config.my_custom_preference = 10
+    end
+  end
+
+  config.before(:each, type: :controller) do
+    @request.env['devise.mapping'] = Devise.mappings[:spree_user]
+  end
+
+  config.include Spree::TestingSupport::Preferences
+  config.include Spree::TestingSupport::ControllerRequests, type: :controller
+  config.include Spree::TestingSupport::Flash
+
+  config.include Devise::TestHelpers, type: :controller if defined?(Devise)
+
+  if defined?(Warden)
+    config.include Warden::Test::Helpers
+    config.before :suite do
+      Warden.test_mode!
+    end
+  end
 end

data/lib/spree_cmd/templates/extension/spec/support/add_to_cart.rb

@@ -0,0 +1,15 @@
+def add_to_cart(product)
+  visit spree.product_path(product)
+
+  expect(page).to have_selector('form#add-to-cart-form')
+  expect(page).to have_selector(:button, id: 'add-to-cart-button', disabled: false)
+  click_button 'add-to-cart-button'
+  expect(page).to have_content(Spree.t(:added_to_cart))
+
+  if block_given?
+    yield
+  else
+    click_link 'View cart'
+    expect(page).to have_content 'YOUR SHOPPING CART'
+  end
+end

data/lib/spree_cmd/templates/extension/spec/support/capybara.rb

@@ -1,23 +1,27 @@
 require 'capybara/rspec'
-require 'capybara-screenshot'
 require 'capybara-screenshot/rspec'
 require 'capybara/rails'
+require 'webdrivers/chromedriver'
+require 'selenium/webdriver'
 
-RSpec.configure do
-  Capybara.register_driver :chrome do |app|
-    Selenium::WebDriver.logger.level = :error
-
-    Capybara::Selenium::Driver.new app,
-      browser: :chrome,
-      options: Selenium::WebDriver::Chrome::Options.new(
-        args: %w[headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
-        log_level: :error
-      )
-  end
-  Capybara.javascript_driver = :chrome
+if ENV['CIRCLE_NODE_INDEX'].present?
+  Webdrivers.install_dir = File.expand_path('~/.webdrivers/' + ENV['CIRCLE_NODE_INDEX'].to_s)
+end
 
-  Capybara::Screenshot.register_driver(:chrome) do |driver, path|
-    driver.browser.save_screenshot(path)
-  end
+# capybara-screenshot
+Capybara.save_path = ENV.fetch('CIRCLE_ARTIFACTS', Rails.root.join('tmp', 'capybara')).to_s
+Capybara::Screenshot.prune_strategy = { keep: 20 }
+Capybara::Screenshot.register_driver(:chrome) do |driver, path|
+  driver.browser.save_screenshot(path)
+end
 
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new app,
+    browser: :chrome,
+    options: Selenium::WebDriver::Chrome::Options.new(
+      args: %w[no-sandbox disable-dev-shm-usage disable-popup-blocking headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
+      log_level: :error
+    )
 end
+
+Capybara.javascript_driver = :chrome

data/lib/spree_cmd/templates/extension/travis.yml

@@ -12,9 +12,9 @@ addons:
   postgresql: 9.4
 
 gemfile:
-  - gemfiles/spree_3_5.gemfile
   - gemfiles/spree_3_7.gemfile
   - gemfiles/spree_4_0.gemfile
+  - gemfiles/spree_4_1.gemfile
   - gemfiles/spree_master.gemfile
 
 script:
@@ -23,23 +23,10 @@ script:
 
 rvm:
   - 2.5.1
-  - 2.4.4
-  - 2.3.8
 
 matrix:
   allow_failures:
     - gemfile: gemfiles/spree_master.gemfile
-  exclude:
-    - rvm: 2.3.8
-      gemfile: gemfiles/spree_4_0.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/spree_4_0.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/spree_master.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/spree_master.gemfile
-    - rvm: 2.5.1
-      gemfile: gemfiles/spree_3_5.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

data/spree_cmd.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rspec'
   # Temporary hack until https://github.com/wycats/thor/issues/234 is fixed
-  s.add_dependency 'thor', '~> 0.14'
+  s.add_dependency 'thor', '>= 0.14', '< 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cmd
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc3
+  version: 4.1.0
 platform: ruby
 authors:
 - Chris Mar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,16 +28,22 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: tools to create new Spree stores and extensions
 email:
 - chris@spreecommerce.com
@@ -61,17 +67,13 @@ files:
 - lib/spree_cmd/templates/extension/LICENSE
 - lib/spree_cmd/templates/extension/README.md
 - lib/spree_cmd/templates/extension/Rakefile
-- lib/spree_cmd/templates/extension/app/assets/javascripts/spree/backend/%file_name%.js
-- lib/spree_cmd/templates/extension/app/assets/javascripts/spree/frontend/%file_name%.js
-- lib/spree_cmd/templates/extension/app/assets/stylesheets/spree/backend/%file_name%.css
-- lib/spree_cmd/templates/extension/app/assets/stylesheets/spree/frontend/%file_name%.css
 - lib/spree_cmd/templates/extension/bin/rails.tt
 - lib/spree_cmd/templates/extension/config/locales/en.yml
 - lib/spree_cmd/templates/extension/config/routes.rb
 - lib/spree_cmd/templates/extension/extension.gemspec
-- lib/spree_cmd/templates/extension/gemfiles/spree_3_5.gemfile
 - lib/spree_cmd/templates/extension/gemfiles/spree_3_7.gemfile
 - lib/spree_cmd/templates/extension/gemfiles/spree_4_0.gemfile
+- lib/spree_cmd/templates/extension/gemfiles/spree_4_1.gemfile
 - lib/spree_cmd/templates/extension/gemfiles/spree_master.gemfile
 - lib/spree_cmd/templates/extension/gitignore
 - lib/spree_cmd/templates/extension/lib/%file_name%.rb.tt
@@ -82,6 +84,7 @@ files:
 - lib/spree_cmd/templates/extension/rspec
 - lib/spree_cmd/templates/extension/spec/.rubocop.yml
 - lib/spree_cmd/templates/extension/spec/spec_helper.rb
+- lib/spree_cmd/templates/extension/spec/support/add_to_cart.rb
 - lib/spree_cmd/templates/extension/spec/support/capybara.rb
 - lib/spree_cmd/templates/extension/spec/support/database_cleaner.rb
 - lib/spree_cmd/templates/extension/spec/support/factory_bot.rb
@@ -102,9 +105,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 

data/lib/spree_cmd/templates/extension/app/assets/javascripts/spree/backend/%file_name%.js

@@ -1,2 +0,0 @@
-// Placeholder manifest file.
-// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/backend/all.js'

data/lib/spree_cmd/templates/extension/app/assets/javascripts/spree/frontend/%file_name%.js

@@ -1,2 +0,0 @@
-// Placeholder manifest file.
-// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/frontend/all.js'

data/lib/spree_cmd/templates/extension/app/assets/stylesheets/spree/backend/%file_name%.css

@@ -1,4 +0,0 @@
-/*
-Placeholder manifest file.
-the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/backend/all.css'
-*/

data/lib/spree_cmd/templates/extension/app/assets/stylesheets/spree/frontend/%file_name%.css

@@ -1,4 +0,0 @@
-/*
-Placeholder manifest file.
-the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/frontend/all.css'
-*/