Master

.gitignore

@@ -12,11 +12,18 @@ db/sample9
 .bundle
 config/deploy
 config/deploy/*
-Gemfile.lock
-Gemfile.lock
+public/shops/staging
 public/shops/development
+public/shops/aliyun_development
 public/shops/test
+public/*.dalianshops.com
 config/deploy/production.rb
 db/full_sql
 rdoc
 .settings
+.project
+.ruby-version
+db/*.sqlite3
+*.bak
+.byebug_history
+aliyun_sdk.log

.rspec

@@ -1 +1,2 @@
---colour
+--color
+--require spec_helper

Gemfile

@@ -1,99 +1,137 @@
-#source 'http://rubygems.org'
-source 'http://ruby.taobao.org/'
-# Bundle edge Rails instead:
-ruby '1.9.3'
-
-gem 'rails', '4.1.8'
-
-gem 'mysql2'
-
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.2'
-
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
-
-#gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-#group :test, :development do
-#  gem "rspec-rails", "~> 2.0"
-#  gem "capybara"
-#end
-
-gem 'ruby-hmac' #http://ryanbigg.com/2009/07/no-such-file-to-load-hmac-sha1/
-
-gem 'spree', '~>2.4'
-
-# bundle config --local local.spree_simple_dash ../spree_simple_dash, using local for development 
-# :path => '../spree_simple_dash' 
-# replace Spree Analytics
-# gem 'spree_simple_dash', :github=>"RuanShan/spree_simple_dash", :branch=>"1-2-stable"
-
-# referer to https://github.com/spree/spree/issues/2013
-gem 'spree_auth_devise', :github => "spree/spree_auth_devise", :branch => "2-4-stable"
-#support rich_editor 
-gem 'spree_editor',  :github => "spree/spree_editor", :branch=>"2-4-stable"
-gem 'tinymce-rails-langs'
-#gem 'daemons'
-#gem 'delayed_job_active_record'
-#'bundle update spree_multi_site' to update gem
-# bundle config require specified branch, or warning message as below
-# Cannot use local override for spree_multi_site at ../spree_multi_site because :branch is not specified in Gemfile. Specify a branch or use `bundle config --delete` to remove the local override
-
-gem 'spree_multi_site',   :path => './spree_multi_site'
-
-gem "friendly_id" # spree_theme require it.
-gem 'spree_theme',   :path => './spree_theme'
-
-#only specify it here, then could use ActiveMerchant::Billing::Integrations::Alipay::Helper directly
-gem 'offsite_payments'
-gem 'activemerchant_patch_for_china', github:'RuanShan/activemerchant_patch_for_china', branch:'for_offsite_payments'
-gem 'spree_alipay',   :github => "RuanShan/spree_alipay", :branch=>"master"
-
-gem 'spree_china_checkout',   :path => './spree_china_checkout'
-
-gem 'spree_essential_blog',   :path => './spree_essential_blog'
-
-# copy from https://github.com/RuanShan/spree_flexi_variants/tree/2-1-stable
-gem 'spree_flexi_variants',   :path => './spree_flexi_variants'
-
-# copy from https://github.com/spree-contrib/spree_comments/tree/2-0-stable
-gem 'spree_comments',   :path => './spree_comments'
-
-group :test, :development do
-  gem 'mail_view'  #, :git => 'https://github.com/37signals/mail_view.git'
-end
-
-group :test do
-  gem 'rspec-rails'
-  gem 'database_cleaner'
-  gem 'factory_girl'
-  gem 'capybara'
-  gem 'capybara-accessible'  
-  gem 'webmock'
-end
-#execjs need js runtime
-gem 'therubyracer' 
-
-group :development do
-  gem 'capistrano'
-  gem 'capistrano-rails', '~> 1.1.0'
-  gem 'capistrano-rvm', '~> 0.1.0'
-  gem "rails-erd"
-end
-
-
+source 'https://gems.ruby-china.org'
+#source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# Bundle edge Rails instead:
+# ruby '2.2.4'
+
+gem 'rails', '~>5.1'
+
+gem 'mysql2'
+
+# Use Puma as the app server
+gem 'puma', '~> 3.7'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+
+#gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+gem 'turbolinks', '~> 5.0.0'
+
+eval(File.read(File.dirname(__FILE__) + '/common_spree_dependencies.rb'))
+#support rich_editor
+gem 'ckeditor'
+gem 'spree_editor',  github: "spree/spree_editor", branch: "master"
+
+#gem 'spree_related_products', github: 'RuanShan/spree_related_products', branch: "3-1-stable"
+# gem 'sprangular',   path: './sprangular'
+#'bundle update spree_multi_site' to update gem
+# bundle config require specified branch, or warning message as below
+# Cannot use local override for spree_multi_site at ../spree_multi_site because :branch is not specified in Gemfile. Specify a branch or use `bundle config --delete` to remove the local override
+
+#gem 'spree_multi_site',   path: './spree_multi_site'
+
+# Use SCSS for stylesheets,  spree_theme/spree_devise_auth required
+#gem 'spree_multi_site',   path: './spree_multi_site'
+gem 'kaminari'
+gem "acts_as_commentable"
+gem 'acts-as-taggable-on'
+gem 'useragent'
+gem "font-awesome-rails"
+gem 'spree_theme',   path: './spree_theme'
+
+#activemerchant_patch_for_china requried
+gem 'ruby-hmac' #http://ryanbigg.com/2009/07/no-such-file-to-load-hmac-sha1/
+#only specify it here, then could use ActiveMerchant::Billing::Integrations::Alipay::Helper directly
+gem 'alipay'
+#gem 'offsite_payments'
+#gem 'spree_alipay',   github:  "RuanShan/spree_alipay", branch: "master"
+
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+gem 'spree_china_checkout',   path: './spree_china_checkout'
+#gem 'spree_essential_blog',   path: './spree_essential_blog'
+
+#gem 'spree_pingpp',   path: './spree_pingpp'
+
+gem 'wechat'
+#gem 'spree_omniauth',   path: './spree_omniauth'
+
+# copy from https://github.com/RuanShan/spree_flexi_variants/tree/2-1-stable
+# gem 'spree_flexi_variants',   path: './spree_flexi_variants'
+
+# copy from https://github.com/spree-contrib/spree_comments/tree/2-0-stable
+#gem 'spree_comments',   path: './spree_comments' # it is moved into spree_theme
+gem 'paperclip_oss_storage',   github: 'RuanShan/paperclip_oss_storage', branch: 'master'
+
+gem 'spree_mail_settings',   github: 'RuanShan/spree_mail_settings', branch: 'master'
+#
+gem 'bootstrap-sass', '~> 3.3.6'
+gem 'autoprefixer-rails'
+
+gem 'activerecord-session_store'
+
+#gem 'proclaimer', github: 'RuanShan/proclaimer', branch: 'master'
+#gem 'sidekiq'
+gem 'exception_notification'
+#gem 'spree_social', github: 'spree-contrib/spree_social', branch: 'master'
+#gem 'omniauth'
+#gem "omniauth-wechat-oauth2", git: 'git@github.com:yangsr/omniauth-wechat-oauth2.git'
+
+# memcached 1.4+
+# Dalli, kgio is for Dalli
+#gem 'kgio'
+#gem 'dalli'
+gem 'sitemap_generator'
+
+
+group :test, :development do
+  gem 'sqlite3'
+  #gem 'mail_view'  #, :git => 'https://github.com/37signals/mail_view.git'
+end
+
+group :test do
+  gem 'capybara', '~> 2.4'
+  gem 'database_cleaner', '~> 1.3'
+  gem 'email_spec'
+  gem 'factory_girl_rails', '~> 4.5.0'
+  gem 'launchy'
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-collection_matchers'
+  gem 'rspec-its'
+  gem 'rspec-rails', '~> 3.1.0'
+  gem 'selenium-webdriver'
+  gem 'simplecov'
+  gem 'webmock', '1.8.11'
+  gem 'poltergeist', '1.5.0'
+  gem 'timecop'
+  gem 'with_model'
+end
+
+group :development do
+  gem 'pry-rails'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'byebug'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+
+#gem 'aliyun-oss-sync',   github: 'qhwa/aliyun-oss-sync', branch: 'master'
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'wdm', '>= 0.1.0', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'aliyun-sdk',   github: 'luluhongxu/aliyun-oss-ruby-sdk', branch: 'master'