locomotivecms_wagon 3.0.0.rc0 → 3.0.0

data/spec/integration/commands/push_command_spec.rb

@@ -25,27 +25,57 @@ describe Locomotive::Wagon::PushCommand do
       let(:env) { 'hosting' }
 
       before do
+        allow(command).to receive(:ask_for_performing).with('You are about to deploy a new site').and_return(true)
         allow(Netrc).to receive(:read).and_return(TEST_PLATFORM_ALT_URL => credentials)
+        allow(command).to receive(:ask_for_performing).with("Warning! You're about to deploy data which will alter the content of your site.").and_return(true)
         allow(shell).to receive(:ask).with("What is the URL of your platform? (default: https://station.locomotive.works)").and_return(TEST_PLATFORM_URL)
         allow(shell).to receive(:ask).with('What is the handle of your site? (default: a random one)').and_return('wagon-test')
       end
 
       after { restore_deploy_file(default_site_path) }
 
-      it 'creates a site and push the site' do
-        resources = []
-        ActiveSupport::Notifications.subscribe('wagon.push') do |name, start, finish, id, payload|
-          resources << payload[:name]
+      context 'answer yes to the deployment of the data' do
+
+        before do
+          allow(shell).to receive(:yes?).with("Are you sure you want to perform this action? (answer yes or no)").and_return(true)
+        end
+
+        it 'creates a site and push the site' do
+          resources = []
+          ActiveSupport::Notifications.subscribe('wagon.push') do |name, start, finish, id, payload|
+            resources << payload[:name]
+          end
+          is_expected.not_to eq nil
+          expect(resources).to eq %w(site content_types content_entries pages snippets sections theme_assets translations)
         end
-        is_expected.not_to eq nil
-        expect(resources).to eq %w(site content_types content_entries pages snippets sections theme_assets translations)
+
+        context 'no previous authentication' do
+
+          let(:credentials) { nil }
+
+          it 'stops the deployment' do
+            expect(shell).to receive(:say).with("Sorry, we were unable to find the credentials for this platform.\nPlease first login using the \"bundle exec wagon auth\"", :yellow)
+            is_expected.to eq nil
+          end
+
+        end
+
       end
 
-      context 'no previous authentication' do
+      context 'answer no to the deployment of the data' do
 
-        let(:credentials) { nil }
+        before do
+          allow(command).to receive(:ask_for_performing).with("Warning! You're about to deploy data which will alter the content of your site.").and_return(nil)
+        end
 
-        it { expect { subject }.to raise_error('You need to run `wagon auth` before going further') }
+        it "doesn't push the site" do
+          resources = []
+          ActiveSupport::Notifications.subscribe('wagon.push') do |name, start, finish, id, payload|
+            resources << payload[:name]
+          end
+          is_expected.to eq nil
+          expect(resources).to eq([])
+        end
 
       end
 

data/spec/integration/commands/sync_command_spec.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 require File.dirname(__FILE__) + '/../integration_helper'
+require 'locomotive/steam'
+require 'locomotive/steam/adapters/filesystem'
 require 'locomotive/wagon/commands/push_command'
 require 'locomotive/wagon/commands/sync_command'
 require 'thor'
@@ -44,11 +46,15 @@ describe Locomotive::Wagon::SyncCommand do
   end
 
   def create_site
+    _command    = Locomotive::Wagon::PushCommand.new(env, path, { data: true, verbose: false }, shell)
     credentials = instance_double('Credentials', login: TEST_API_EMAIL, password: TEST_API_KEY)
     allow(Netrc).to receive(:read).and_return(TEST_PLATFORM_ALT_URL => credentials)
+    allow(_command).to receive(:ask_for_performing).with('You are about to deploy a new site').and_return(true)
+    allow(_command).to receive(:ask_for_performing).with("Warning! You're about to deploy data which will alter the content of your site.").and_return(true)
     expect(shell).to receive(:ask).with("What is the URL of your platform? (default: https://station.locomotive.works)").and_return(TEST_PLATFORM_URL)
     expect(shell).to receive(:ask).with('What is the handle of your site? (default: a random one)').and_return('wagon-test-sync')
-    Locomotive::Wagon::PushCommand.push(env, path, { data: true, verbose: false }, shell)
+    _command.push
+    # Locomotive::Wagon::PushCommand.push(env, path, { data: true, verbose: false }, shell)
   end
 
 end

data/spec/support/vcr.rb

@@ -1,12 +1,25 @@
 require 'vcr'
 require 'faraday'
 
+# Custom VCR matchers
+custom_body_matcher = lambda do |request_1, request_2|
+  if request_1.body.encoding.name == 'ASCII-8BIT'
+    # when uploading a file, we noticed that VCR or Faraday added 2 extra characters
+    # at the end of the body: \r\n.
+    request_1.body == request_2.body ||
+    request_1.body == request_2.body.gsub(/\r\n$/, '')
+  else
+    request_1.body == request_2.body
+  end
+end
+
 # VCR config
 VCR.configure do |c|
   c.cassette_library_dir = 'spec/fixtures/cassettes'
   c.hook_into :faraday
   c.ignore_hosts 'codeclimate.com'
   c.configure_rspec_metadata!
+  c.register_request_matcher :custom_body, &custom_body_matcher
 end
 
 # Without this, VCR is unable to match a POST request with uploaded files

data/spec/unit/decorators/site_decorator_spec.rb

@@ -5,6 +5,7 @@ require 'ostruct'
 
 require 'locomotive/wagon/decorators/concerns/to_hash_concern'
 require 'locomotive/wagon/decorators/concerns/persist_assets_concern'
+require 'locomotive/steam/decorators/i18n_decorator'
 require 'locomotive/wagon/decorators/site_decorator'
 
 describe Locomotive::Wagon::SiteDecorator do
@@ -14,7 +15,7 @@ describe Locomotive::Wagon::SiteDecorator do
 
   describe '#domains' do
 
-    let(:attributes) { { domains: ['acme.com', 'localhost'] } }
+    let(:attributes) { { domains: ['acme.com', 'localhost'], default_locale: 'en', localized_attributes: [] } }
 
     subject { decorator.domains }
 
@@ -25,7 +26,7 @@ describe Locomotive::Wagon::SiteDecorator do
   describe '#to_hash' do
 
     let(:seo_title)   { instance_double('I18nField', translations: { en: 'Hi', fr: 'Bonjour' }) }
-    let(:attributes)  { { name: 'Acme', handle: nil, seo_title: seo_title, locales: nil } }
+    let(:attributes)  { { name: 'Acme', handle: nil, seo_title: seo_title, locales: nil, default_locale: 'en', localized_attributes: [] } }
     let(:site)        { OpenStruct.new(attributes) }
 
     subject { decorator.to_hash }
@@ -36,7 +37,7 @@ describe Locomotive::Wagon::SiteDecorator do
 
       let(:metafields)    { { some: 'Acme', img: '/samples/42.png', img2: '/samples/bar.png' } }
       let(:schema)        { { some: { label: 'Some', type: 'string' }, img: { label: 'img', type: 'image' }, img2: { label: 'img2', type: 'image' } } }
-      let(:attributes)    { { name: 'Acme', handle: nil, seo_title: seo_title, locales: nil, metafields: metafields, metafields_schema: schema } }
+      let(:attributes)    { { name: 'Acme', handle: nil, seo_title: seo_title, locales: nil, metafields: metafields, metafields_schema: schema, default_locale: 'en', localized_attributes: [] } }
       let(:asset_pusher)  { SimpleAssetPusher.new }
 
       before { allow(decorator).to receive(:__content_assets_pusher__).and_return(asset_pusher) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc0
+  version: 3.0.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 0.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 0.20.3
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -73,70 +73,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.11
+        version: 3.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.11
+        version: 3.9.2
 - !ruby/object:Gem::Dependency
   name: locomotivecms_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: locomotivecms_coal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0.beta1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0.beta1
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0.rc0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0.rc0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- TODO
 - bin/wagon
 - generators/blank/.gitignore
 - generators/blank/Gemfile.tt
@@ -225,6 +224,7 @@ files:
 - generators/blank/public/images/.empty_directory
 - generators/blank/public/javascripts/.empty_directory
 - generators/blank/public/samples/.empty_directory
+- generators/blank/public/samples/images/default.svg
 - generators/blank/public/stylesheets/.empty_directory
 - generators/cloned/Gemfile.tt
 - generators/cloned/app/content_types/.empty_directory
@@ -463,12 +463,11 @@ 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: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine

data/TODO

@@ -1,57 +0,0 @@
-*** REQUIREMENTS ***
-
-x templatized page
-x localized page
-x dragonfly
-- listen:
-  x content types and content entries / site
-  - make it work for other platforms (linux, windows)
-x post content entry
-x liquid assigns: sessions (rack)
-x I18n keys
-  x fr/en
-  x other locales
-x static js/css assets (non coffeescript or sass files) are not reloaded if got changed.
-x content types / liquid
-  x group_contents_by
-  x select_names
-x params to launch the thin server (port, address ?)
-- commands:
-  ! create
-    ! sites
-      x blank
-      x twitter bootstrap + HAML
-      ? localized
-      ? boilerplate
-      ! copy Bundler / Gemfile (pending)
-    x content types
-      x definitions
-      x data (Faker)
-    x page
-    x snippet
-  - push:
-    x option to select to push only some parts (pages, ...etc)
-    x --force option
-    - more tests
-  - pull
-- translations (Rod)
-- version checkings:
-  - wagon when running it
-  - engine when pushing a site
-- nice error page (replace the default exception middleware) to display:
-  - liquid errors
-  - other exceptions
-- nice logs
-
-- tests (Rod/Did)
-
-- refactoring:
-  x generators/sites -> generators/site
-  x list is only for site generators
-  x move the call to the CC generator directly in the wagon.rb file
-
-*** FEATURES ***
-
-- toolbar to:
-  - push a whole site / page(s) / snippet(s) / ....
-  - create / update a content type