locomotivecms_wagon 2.0.0.rc4 → 2.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ad90755ba57d30b5940644109731167eb1244b
-  data.tar.gz: cf68675f04cd78369b69cd23883ea9973453f027
+  metadata.gz: 3ec6622d8b17580c78b7d74ce43267db20a84f32
+  data.tar.gz: c155e38db2000ce5c619260f44ab08fed2d6fb2a
 SHA512:
-  metadata.gz: b57f24c856de5513c12b10654a675fb9ca9daec3bf0541fffee3823c83e41da9864d45c2a2046ad173d17d1b541b2da429e1d3fcfe9dd4c07a1f5bb71e829314
-  data.tar.gz: 98e831a0ed6f811713b853878222d73730c73ea33f78814282efa98ca9c9cafd4d147cc4e7fc9c2bb8797ac4d9d7c22cd08e6a6cd5b482185b97fe2fc639bbc5
+  metadata.gz: f32d26356b9d0a6ed28015d47b64d4370c212d6eca3179a38685ad550ff9be89ddd6ea531eecb533165e09fc4684b81d66d71e9e3cca54397011df39855b10b9
+  data.tar.gz: 2faf0ca74f7f472d3c2316824a26e893c1b4fc2673992ad9f3ee7b5b7a7e5010c003c74676e58c6831ca023ad1c158ae7cbeac8c2f17591ab0d65b2c01abdead

data/Gemfile

@@ -8,7 +8,7 @@ gem 'rb-fsevent', '~> 0.9.1'
 gem 'therubyracer'
 
 # Development
-# gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '25e6852', require: false
+# gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '0aa777b', require: false
 # gem 'locomotivecms_coal', github: 'locomotivecms/coal', ref: '32b2844', require: false
 # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '3046b79893', require: false
 

data/lib/locomotive/wagon/cli.rb

@@ -346,15 +346,23 @@ module Locomotive
           end
         end
 
-        desc 'destroy ENV [PATH]', 'Destroy a remote Locomotive site'
-        def destroy(env, path = '.')
-          if check_path!(path)
-            if ask('Are you sure?', limited_to: %w(yes no)) == 'yes'
-              Locomotive::Wagon.destroy(env, path)
-            else
-              say 'The destroy operation has been cancelled', :red
-              exit(1)
-            end
+        desc 'delete ENV RESOURCE [SLUG] [PATH]', 'Delete a resource from a remote Locomotive Engine.'
+        long_desc <<-LONGDESC
+          Deletes a site, page, content_type, snippet, theme_asset or translation from the remote Locomotive Engine.
+
+          It can also delete all the items of a resource if you pass: content_types, snippets, theme_assets or translations as the RESOURCE.
+
+          If you need to delete the whole site for the current ENV, just pass site as the RESOURCE.
+
+          RESOURCE can be set to site, page, content_type(s), snippet(s), theme_asset(s) or translation(s).
+          SLUG is the slug of the specific resource to delete
+        LONGDESC
+        def delete(env, resource, slug = nil, path = '.')
+          if ask('Are you sure?', limited_to: %w(yes no)) == 'yes'
+            Locomotive::Wagon.delete(env, path, resource, slug, shell)
+          else
+            say 'The delete operation has been cancelled', :red
+            exit(1)
           end
         end
 

data/lib/locomotive/wagon/commands/concerns/api_concern.rb

@@ -44,6 +44,10 @@ module Locomotive::Wagon
       end
     end
 
+    def connection_information_from_env_and_path
+      read_deploy_settings(self.env, self.path)
+    end
+
     private
 
     def api_uri

data/lib/locomotive/wagon/commands/delete_command.rb

@@ -0,0 +1,77 @@
+require_relative  'concerns/api_concern'
+require_relative  'concerns/deploy_file_concern'
+require 'active_support/inflector'
+
+module Locomotive::Wagon
+  class DeleteCommand < Struct.new(:env, :path, :resource, :identifier, :shell)
+
+    include ApiConcern
+    include DeployFileConcern
+
+    SITE_RESOURCE     = 'site'
+    SINGLE_RESOURCES  = %w(page content_type snippet translation).freeze
+    ALL_RESOURCES     = %w(content_types snippets theme_assets translations).freeze
+
+    # @param [ String ] env The environment to delete from
+    # @param [ String ] path The path to a wagon site to delete from
+    # @param [ String ] resource The resource type to delete.  @see RESOURCES
+    # @param [ String ] identifier The id or handle of the resource entry to delete
+    def self.delete(*args)
+      new(*args).delete
+    end
+
+    # @raise [ ArgumentError ] unless the given resources is in SINGLE_RESOURCES or MULTIPLE_RESOURCES
+    def delete
+      if resource == SITE_RESOURCE
+        delete_site
+      elsif SINGLE_RESOURCES.include?(resource)
+        delete_single
+      elsif ALL_RESOURCES.include?(resource)
+        delete_all
+      else
+        raise ArgumentError, "Resource must be one of #{SINGLE_RESOURCES.join(?,)} if you pass an identifier OR be one of #{ALL_RESOURCES.join(?,)} if you want to delete all the items of that resource."
+      end
+    end
+
+    private
+
+    def delete_site
+      if shell.ask('Please, type the handle of your site') == client.options[:handle]
+        client.current_site.destroy.tap do |response|
+          shell.say "The remote site specified in your #{env} environment has been deleted.", :green
+        end
+      else
+        shell.say 'The delete operation has been cancelled', :red
+      end
+    end
+
+    def delete_single
+      client.send(resource_method).destroy(identifier).tap do |response|
+        shell.say "The #{identifier} #{singular_resource_method} has been deleted.", :green
+      end
+    end
+
+    def delete_all
+      client.send(resource_method).destroy_all.tap do |response|
+        shell.say "#{response['deletions']} #{resource_method} have been deleted", :green
+      end
+    end
+
+    def resource_method
+      @resource_method ||= resource.pluralize
+    end
+
+    def singular_resource_method
+      @resource_method.singularize
+    end
+
+    def current_site
+      @current_site ||= client.current_site
+    end
+
+    def client
+      @api_site_client ||= api_site_client(connection_information_from_env_and_path)
+    end
+
+  end
+end

data/lib/locomotive/wagon/commands/pull_command.rb

@@ -37,6 +37,7 @@ module Locomotive::Wagon
 
     def _pull
       api_client = api_site_client(connection_information)
+
       site = api_client.current_site.get
 
       each_resource do |klass|

data/lib/locomotive/wagon/commands/pull_sub_commands/concerns/assets_concern.rb

@@ -42,7 +42,7 @@ module Locomotive::Wagon
         folder, ext = File.dirname(filepath), File.extname(filepath)
         basename = File.basename(filepath, ext)
 
-        find_unique_filepath(File.join(folder, "#{basename}-#{index}#{ext}"), binary, index + 1)
+        find_unique_filepath(File.join(folder, "#{basename}-#{index}#{ext}"), binary_file, index + 1)
       else
         filepath
       end

data/lib/locomotive/wagon/commands/push_command.rb

@@ -31,27 +31,29 @@ module Locomotive::Wagon
     end
 
     def push
+      require_misc_gems
+
+      api_client = build_api_site_client(connection_information)
+
       if options[:verbose]
         PushLogger.new
-        _push
+        _push(api_client)
       else
-        show_wait_spinner('Deploying...') { _push }
+        show_wait_spinner('Deploying...') { _push(api_client) }
       end
     end
 
     private
 
-    def _push
-      require_misc_gems
-
-      api_client = build_api_site_client(connection_information)
-
+    def _push(api_client)
       validate!
 
       content_assets_pusher = Locomotive::Wagon::PushContentAssetsCommand.new(api_client, steam_services)
 
       each_resource do |klass|
-        klass.push(api_client, steam_services, content_assets_pusher, remote_site)
+        klass.push(api_client, steam_services, content_assets_pusher, remote_site) do |pusher|
+          pusher.with_data if options[:data]
+        end
       end
 
       print_result_message

data/lib/locomotive/wagon/commands/push_sub_commands/push_base_command.rb

@@ -7,7 +7,9 @@ module Locomotive::Wagon
     def_delegators :steam_services, :current_site, :locale, :repositories
 
     def self.push(api_client, steam_services, content_assets_pusher, remote_site)
-      new(api_client, steam_services, content_assets_pusher, remote_site).push
+      instance = new(api_client, steam_services, content_assets_pusher, remote_site)
+      yield instance if block_given?
+      instance.push
     end
 
     def push
@@ -61,6 +63,14 @@ module Locomotive::Wagon
       File.expand_path(repositories.adapter.options[:path])
     end
 
+    def with_data
+      @with_data = true
+    end
+
+    def with_data?
+      !!@with_data
+    end
+
     class SkipPersistingException < Exception
     end
 

data/lib/locomotive/wagon/commands/push_sub_commands/push_pages_command.rb

@@ -39,7 +39,8 @@ module Locomotive::Wagon
     private
 
     def _decorate(entity)
-      PageDecorator.new(entity, default_locale, content_assets_pusher, remote_site.edited?)
+      persist_content = with_data? || !remote_site.edited?
+      PageDecorator.new(entity, default_locale, content_assets_pusher, persist_content)
     end
 
     def remote_entity_id(fullpath)

data/lib/locomotive/wagon/commands/sync_command.rb

@@ -39,6 +39,7 @@ module Locomotive::Wagon
 
     def _sync
       api_client = api_site_client(connection_information)
+
       site = api_client.current_site.get
 
       each_resource do |klass|

data/lib/locomotive/wagon/decorators/content_entry_decorator.rb

@@ -87,8 +87,15 @@ module Locomotive
       end
 
       def decorate_many_to_many_field(value)
-        return nil if value.nil?
-        value.all.map { |entry| entry._slug.try(:[], __locale__) }.compact
+        entries = value.all
+
+        if entries.empty?
+          nil
+        elsif entries.size == 1 && entries.first == ''
+          [nil]
+        else
+          entries.map { |entry| entry._slug.try(:[], __locale__) }.compact
+        end.tap { |o| puts o.inspect }
       end
 
       def decorate_has_many_field(value)

data/lib/locomotive/wagon/decorators/page_decorator.rb

@@ -6,11 +6,11 @@ module Locomotive
       include ToHashConcern
       include PersistAssetsConcern
 
-      attr_accessor :__content_assets_pusher__, :__site_edited__
+      attr_accessor :__content_assets_pusher__, :__persist_content__
 
-      def initialize(object, locale = nil, content_assets_pusher, site_edited)
+      def initialize(object, locale = nil, content_assets_pusher, persist_content)
         self.__content_assets_pusher__ = content_assets_pusher
-        self.__site_edited__ = site_edited
+        self.__persist_content__ = persist_content
         super(object, locale, nil)
       end
 
@@ -26,7 +26,7 @@ module Locomotive
           template)
 
         # remove the attributes that end-users might have modified in the back-office
-        if persisted? && __site_edited__
+        if persisted? && !__persist_content__
           _attributes -= %i(title published listed position seo_title meta_keywords meta_description editable_elements)
         end
 

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.0.0.rc4'
+    VERSION = '2.0.0.rc5'
   end
 end

data/lib/locomotive/wagon.rb

@@ -109,15 +109,15 @@ module Locomotive
       Locomotive::Wagon::CloneCommand.clone(name, path, options, shell)
     end
 
-    # Destroy a remote site
+    # Delete one or all remote resource(s)
     #
     # @param [ String ] env The environment we use to deploy the site to
     # @param [ String ] path The path of the site
-    # @param [ Hash ] options The options passed to the destroy command
-    #
-    def self.destroy(env, path, options = {})
-      require_relative 'wagon/commands/destroy_command'
-      Locomotive::Wagon::DestroyCommand.destroy(env, path, options)
+    # @param [ String ] resource The resource from which we want to delete an entry or all entries
+    # @param [ String ] slug The slug of the resource to delete
+    def self.delete(env, path, resource, slug, shell)
+      require_relative 'wagon/commands/delete_command'
+      Locomotive::Wagon::DeleteCommand.delete(env, path, resource, slug, shell)
     end
 
   end

data/locomotivecms_wagon.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'netrc',                 '~> 0.10.3'
 
   gem.add_dependency 'locomotivecms_common',  '~> 0.0.5'
-  gem.add_dependency 'locomotivecms_coal',    '~> 1.0.0.rc2'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0.rc6'
+  gem.add_dependency 'locomotivecms_coal',    '~> 1.0.0.rc3'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0.rc7'
 
   gem.add_dependency 'listen',                '~> 3.0.4'
   gem.add_dependency 'rack-livereload',       '~> 0.3.16'

data/spec/fixtures/cassettes/authenticate.yml

@@ -27,16 +27,16 @@ http_interactions:
       Cache-Control:
       - no-cache
       X-Request-Id:
-      - 696238a9-e3ed-46c9-a3b0-fbcddc5dc502
+      - 1eeb9688-e4f0-4a25-8bbb-8f79f152e003
       X-Runtime:
-      - '0.385558'
+      - '0.019606'
       Content-Length:
       - '40'
     body:
       encoding: UTF-8
       string: '{"message":"Invalid email or password."}'
     http_version: 
-  recorded_at: Sun, 22 Nov 2015 22:41:27 GMT
+  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -60,20 +60,20 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"74b2d44bf497a9fd738cca489f42fbb9"
+      - W/"7d05e74769a4e3a32ddc19de535ace0d"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 0f51511a-bd18-4e25-b445-1c417705be82
+      - 14d9561a-97bf-4b9f-adad-488353d1dc13
       X-Runtime:
-      - '0.080074'
+      - '0.070429'
       Content-Length:
       - '250'
     body:
       encoding: UTF-8
-      string: '{"_id":"56524497c36511cdf8000000","created_at":"2015-11-22T22:41:27Z","updated_at":"2015-11-22T22:41:27Z","name":"John","email":"john@doe.net","locale":"en","api_key":"5c57cd2719be65bf16693465814086c461304f27","super_admin":false,"local_admin":false}'
+      string: '{"_id":"5661a15c87f64302c9000043","created_at":"2015-12-04T14:21:16Z","updated_at":"2015-12-04T14:21:16Z","name":"John","email":"john@doe.net","locale":"en","api_key":"bebc2256830ef12eae85623a39158267e12e49c3","super_admin":false,"local_admin":false}'
     http_version: 
-  recorded_at: Sun, 22 Nov 2015 22:41:27 GMT
+  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -97,23 +97,23 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"3385da6413addda803c3126c1b4554b3"
+      - W/"9ad33576c3616b662c8993aff5fb3c0e"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - afa7856b-4434-4526-b547-a84bd3ba5f42
+      - 03f2dcd0-5c95-4859-b556-dd95643dbc07
       X-Runtime:
-      - '0.016850'
+      - '0.018220'
       Content-Length:
       - '32'
     body:
       encoding: UTF-8
-      string: '{"token":"RTjjUayPdSpdSFfKVGja"}'
+      string: '{"token":"N-ddi-7z-19pXmkRRgq_"}'
     http_version: 
-  recorded_at: Sun, 22 Nov 2015 22:41:27 GMT
+  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=RTjjUayPdSpdSFfKVGja
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=N-ddi-7z-19pXmkRRgq_
     body:
       encoding: US-ASCII
       string: ''
@@ -123,7 +123,7 @@ http_interactions:
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - RTjjUayPdSpdSFfKVGja
+      - N-ddi-7z-19pXmkRRgq_
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
@@ -136,23 +136,23 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"53f74d6bf74667cd139e3766f9cda048"
+      - W/"46c8dfee2ff366b7a6ec27cea9505afb"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - fd5d04d4-cad6-469e-8fe8-89fd61802def
+      - b43a45a2-0e95-4f9a-8abf-39b098fc98fc
       X-Runtime:
-      - '0.034500'
+      - '0.028692'
       Content-Length:
       - '261'
     body:
       encoding: UTF-8
-      string: '{"_id":"56524484c36511cdd5000000","created_at":"2015-11-22T22:41:08Z","updated_at":"2015-11-22T22:41:08Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"5661a14f87f643077a000000","created_at":"2015-12-04T14:21:03Z","updated_at":"2015-12-04T14:21:03Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Sun, 22 Nov 2015 22:41:27 GMT
+  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=RTjjUayPdSpdSFfKVGja
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=N-ddi-7z-19pXmkRRgq_
     body:
       encoding: US-ASCII
       string: ''
@@ -162,7 +162,7 @@ http_interactions:
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - RTjjUayPdSpdSFfKVGja
+      - N-ddi-7z-19pXmkRRgq_
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
@@ -175,18 +175,18 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"53f74d6bf74667cd139e3766f9cda048"
+      - W/"46c8dfee2ff366b7a6ec27cea9505afb"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 7da8b735-01ee-4549-9d81-da3281957b25
+      - a6cc68eb-4757-4dc3-a9ca-bb2652068468
       X-Runtime:
-      - '0.018901'
+      - '0.017889'
       Content-Length:
       - '261'
     body:
       encoding: UTF-8
-      string: '{"_id":"56524484c36511cdd5000000","created_at":"2015-11-22T22:41:08Z","updated_at":"2015-11-22T22:41:08Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"5661a14f87f643077a000000","created_at":"2015-12-04T14:21:03Z","updated_at":"2015-12-04T14:21:03Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Sun, 22 Nov 2015 22:41:27 GMT
+  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
 recorded_with: VCR 2.9.3