Aliyun oss feature

.gitignore

@@ -13,10 +13,14 @@ db/sample9
 config/deploy
 config/deploy/*
 Gemfile.lock
-Gemfile.lock
+public/shops/staging
 public/shops/development
+public/shops/aliyun_development
 public/shops/test
 config/deploy/production.rb
 db/full_sql
 rdoc
 .settings
+.project
+db/*.sqlite3
+*.bak

.rspec

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

Gemfile

@@ -1,21 +1,17 @@
-#source 'http://rubygems.org'
-source 'http://ruby.taobao.org/'
-# Bundle edge Rails instead:
-ruby '1.9.3'
+source 'https://ruby.taobao.org/'
+#source 'https://rubygems.org'
+#source "https://rails-assets.org"
 
-gem 'rails', '4.1.8'
+# Bundle edge Rails instead:
+ruby '2.0.0'
 
-gem 'mysql2'
+gem 'rails', '4.1.11'
 
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.2'
+gem 'mysql2','0.3.19'
 
 # 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
@@ -33,67 +29,88 @@ gem 'coffee-rails', '~> 4.0.0'
 #  gem "rspec-rails", "~> 2.0"
 #  gem "capybara"
 #end
+gem 'turbolinks'
+gem 'jquery-turbolinks'
 
-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"
 
+eval(File.read(File.dirname(__FILE__) + '/common_spree_dependencies.rb'))
 # 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 
+#support rich_editor
 gem 'spree_editor',  :github => "spree/spree_editor", :branch=>"2-4-stable"
-gem 'tinymce-rails-langs'
+# gem 'sprangular',   :path => './sprangular'
+
+#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.
+# Use SCSS for stylesheets,  spree_theme/spree_devise_auth required
+gem 'sass-rails', '~> 4.0.2'
+gem "acts_as_commentable"
+gem 'useragent'
 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 '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 'alipay'
+#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=>"2-4-better"
 
-gem 'spree_china_checkout',   :path => './spree_china_checkout'
+gem 'spree_simple_dash',  :github => "spree/spree_simple_dash", :branch=>"master"
 
+gem 'coffee-rails'  #spree_china_checkout required
+gem 'spree_china_checkout',   :path => './spree_china_checkout'
 gem 'spree_essential_blog',   :path => './spree_essential_blog'
+gem 'spree_pingpp',   :path => './spree_pingpp'
 
 # copy from https://github.com/RuanShan/spree_flexi_variants/tree/2-1-stable
-gem 'spree_flexi_variants',   :path => './spree_flexi_variants'
+# 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'
+#gem 'spree_comments',   :path => './spree_comments' # it is moved into spree_theme
+gem 'paperclip_oss_storage',   :github => 'RuanShan/paperclip_oss_storage', :branch=>'master'
+
+#
+gem 'bootstrap-sass', '~> 3.3.1'
+gem 'autoprefixer-rails'
+
+gem 'activerecord-session_store'
 
 group :test, :development do
-  gem 'mail_view'  #, :git => 'https://github.com/37signals/mail_view.git'
+  gem 'sqlite3'
+  #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'
+  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
-#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
-
-
+#execjs need js runtime, use nodejs of system instead.
+#gem 'therubyracer'
+
+#group :development do
+#  gem 'capistrano'
+#  gem 'capistrano-rails', '~> 1.1.0'
+#  gem 'capistrano-rvm', '~> 0.1.0'
+#  #gem "rails-erd"
+#end