locomotivecms_wagon 2.0.0.rc6 → 2.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f762fee2b5e2a55c9000323e814145d6c09cf732
-  data.tar.gz: 7ff6dbc6a2d00eb28b4e2259db598c442eabb7e0
+  metadata.gz: 9e8df3a287cbb05c29d2117ec271460129175326
+  data.tar.gz: c89bdf2637d74db7d876754f7432db3ecaadf0d9
 SHA512:
-  metadata.gz: dea5e635c441886ecf9231bbd7549f1991d0867e16df9761fc8aeda5dddb48f93cd733029e46b8eb2c28fa67d55a5b8f13104dc838a9443b1cc974ef252c75a1
-  data.tar.gz: e26b8a68906b25cfd1f8d1c78669fcd49fc9382f8b02aa67aa8843068dca0f5cceaa5cc44ae8263c081e5c7265522771da476e269fb9fd9310447ff66a1aa8da
+  metadata.gz: 586b40e8f1f65cf0b72953b4aa78fa5296c974be3fdb9a92f67843b3b550b036e1c54e2e4709cae288794a304728ed94c9e497b34467ab7e9c0721e3595d9eb5
+  data.tar.gz: 5578ece2a190b9a70761cd32745211394d5b54153f872500ae8eb2f003f646427874a5b1c4e649127e23f03060f56bbffa143dd6397cb5f2ac4c2d9baa196c59

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.1.1
+before_install:
+  - export TZ=Paris
+  - date
+

data/Gemfile

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

data/README.md

@@ -1,47 +1,53 @@
-# LocomotiveCMS::Wagon
+# Wagon
 
 [![Gem Version](https://badge.fury.io/rb/locomotivecms_wagon.svg)](http://badge.fury.io/rb/locomotivecms_wagon) [![Code Climate](https://codeclimate.com/github/locomotivecms/wagon/badges/gpa.svg)](https://codeclimate.com/github/locomotivecms/wagon) [![Dependency Status](https://gemnasium.com/locomotivecms/wagon.png)](https://gemnasium.com/locomotivecms/wagon) [![Build Status](https://travis-ci.org/locomotivecms/wagon.svg?branch=master)](https://travis-ci.org/locomotivecms/wagon) [![Coverage Status](https://coveralls.io/repos/locomotivecms/wagon/badge.svg?branch=master)](https://coveralls.io/r/locomotivecms/wagon?branch=master)
 
-Wagon is the official site generator for the LocomotiveCMS engine powered by all the efficient and modern HTML development tools (Haml, SASS, Compass, Less).
+Wagon is a command line tool that let's you develop for Locomotive right on your local machine.
+
+With Wagon, you can generate the scaffolding for a new Locomotive site and start adding the content types and templates you need using any text editor. And thanks to Wagon's built-in web server, you can preview the site with your computer's web browser.
+
+Wagon can also deploy sites to any Locomotive Engine using the wagon deploy command. Your changes will immediately be reflected on that site without restarting or making any changes to the Engine server app.
+
+To help you work faster, Wagon comes with support for tools like SASS, LESS, HAML, and CoffeeScript. It also works well with source version control systems like git and svn.
+
+**Note:** The previous version of Wagon (v1.5.8) is available in the *[v1.5.x](https://github.com/locomotivecms/wagon/tree/v1.5.x)* branch
 
 ## Documentation
 
-Please, visit the documentation website of LocomotiveCMS.
+Please, visit the documentation website of Locomotive.
+
+  [http://locomotive-v3.locomotivecms.com](http://locomotive-v3.readme.io)
 
-  [http://doc.locomotivecms.com](http://doc.locomotivecms.com)
+**Note:** The documentation for the previous version (v1.5.x) is available [here](http://doc.locomotivecms.com).
 
 ## Developers / Contributors
 
-### Get the development of the mounter
+### Get the development version of the Steam gem
 
-    $ git clone git://github.com/locomotivecms/mounter.git
+    $ git clone git://github.com/locomotivecms/steam.git
 
   Note: If you want to contribute, you may consider to fork it instead
 
-### Get the source of the wagon
+### Get the source of Wagon
 
     $ git clone git://github.com/locomotivecms/wagon.git
     $ cd wagon
 
   Note: Again, if you want to contribute, you may consider to fork it instead
 
-  Modify the Gemfile to change the link to the *mounter* gem which should point to your local installation of the mounter.
+  Modify the Gemfile to change the link to the *steam* gem which should point to your local installation of Steam.
 
     $ bundle install
 
 ### Test it
 
-#### Run the server with a default site
+#### Run the spec tests
 
-    $ bundle exec bin/wagon serve spec/fixtures/default
-
-#### Push a site
-
-    $ bundle exec bin/wagon push <path to your LocomotiveCMS local site> <url of your remote LocomotiveCMS site> <email of your admin account> <password>
+    $ bundle exec rake spec
 
-#### Pull a site
+#### Run the server with a default site
 
-    $ bundle exec bin/wagon pull <url of your remote LocomotiveCMS site> <email of your admin account> <password>
+    $ bundle exec bin/wagon serve spec/fixtures/default
 
 ## Contributing
 
@@ -55,4 +61,4 @@ Please, visit the documentation website of LocomotiveCMS.
 
 Feel free to contact me (did at locomotivecms dot com).
 
-Copyright (c) 2013 NoCoffee, released under the MIT license
+Copyright (c) 2016 NoCoffee, released under the MIT license

data/generators/content_type/data/%slug%.yml.tt

@@ -13,7 +13,7 @@
 <% when 'date' -%>
     <%= field.name -%>: <%= Time.now.strftime('%Y/%m/%d') -%> # YYYY/MM/DD
 <% when 'file' -%>
-    <%= field.name -%>: null # Path to a file in the public/samples folder or to a remote and external file.
+    # <%= field.name -%>: /samples/<%= config[:slug] -%>/yourfile.txt # Path to a file in the public/samples folder or to a remote and external file.
 <% when 'belongs_to' -%>
     <%= field.name -%>: null # Slug of the target entry
 <% when 'many_to_many' -%>
@@ -21,4 +21,4 @@
 <% end -%>
 <% end -%>
 
-<% end -%>
+<% end -%>

data/lib/locomotive/wagon/cli.rb

@@ -302,6 +302,7 @@ module Locomotive
 
         desc 'deploy ENV [PATH]', 'Deploy a site to a remote Locomotive Engine'
         option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only push the resource(s) passed in argument'
+        option :filter, aliases: '-f', type: 'array', default: nil, desc: 'Push specific resource entries'
         option :data, aliases: '-d', type: 'boolean', default: false, desc: 'Push the content entries and the editable elements (by default, they are not)'
         option :shell, type: 'boolean', default: true, desc: 'Use shell to ask for missing connection information like the site handle (in this case, take a random one)'
         option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'

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

@@ -5,6 +5,7 @@ require_relative 'loggers/push_logger'
 require_relative_all  'concerns'
 require_relative_all  '../decorators/concerns'
 require_relative_all  '../decorators'
+require_relative      '../tools/glob'
 
 require_relative      'push_sub_commands/push_base_command'
 require_relative_all  'push_sub_commands'
@@ -53,6 +54,7 @@ module Locomotive::Wagon
       each_resource do |klass|
         klass.push(api_client, steam_services, content_assets_pusher, remote_site) do |pusher|
           pusher.with_data if options[:data]
+          pusher.only(options[:filter]) unless options[:filter].blank?
         end
       end
 

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

@@ -1,6 +1,6 @@
 module Locomotive::Wagon
 
-  class PushBaseCommand < Struct.new(:api_client, :steam_services, :content_assets_pusher, :remote_site)
+  class PushBaseCommand < Struct.new(:api_client, :steam_services, :content_assets_pusher, :remote_site, :filter)
 
     extend Forwardable
 
@@ -71,6 +71,12 @@ module Locomotive::Wagon
       !!@with_data
     end
 
+    def only(entities)
+      @only_entities = entities.map do |entity_or_filter|
+        Locomotive::Wagon::Glob.new(entity_or_filter.gsub(/\A\//, '')).to_regexp
+      end
+    end
+
     class SkipPersistingException < Exception
     end
 

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

@@ -3,7 +3,10 @@ module Locomotive::Wagon
   class PushPagesCommand < PushBaseCommand
 
     def entities
-      repositories.page.all
+      repositories.page.all.map do |entity|
+        next if skip?(entity)
+        entity
+      end.compact
     end
 
     def decorate(entity)
@@ -67,6 +70,14 @@ module Locomotive::Wagon
       end
     end
 
+    def skip?(entity)
+      return false if @only_entities.blank?
+
+      _path = entity.template_path[default_locale].gsub('./app/views/pages/', '')
+
+      !@only_entities.any? { |regexp| regexp.match(_path) }
+    end
+
   end
 
 end

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

@@ -6,8 +6,9 @@ module Locomotive::Wagon
 
     def entities
       repositories.theme_asset.all.map do |entity|
+        next if skip?(entity)
         decorated = ThemeAssetDecorator.new(entity)
-      end.sort { |a, b| a.priority <=> b.priority }
+      end.compact.sort { |a, b| a.priority <=> b.priority }
     end
 
     def decorate(entity)
@@ -88,6 +89,14 @@ module Locomotive::Wagon
       @sprockets_env ||= Locomotive::Steam::SprocketsEnvironment.new(File.join(path, 'public'), minify: true)
     end
 
+    def skip?(entity)
+      return false if @only_entities.blank?
+
+      _source = entity.source.gsub('./public/', '')
+
+      !@only_entities.any? { |regexp| regexp.match(_source) }
+    end
+
   end
 
 end

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

@@ -45,11 +45,14 @@ module Locomotive
       end
 
       def decorate_date_time_field(value)
+        value.utc.try(:iso8601)
+      end
+
+      def decorate_date_field(value)
         value.try(:iso8601)
       end
 
       alias :decorate_time_field :decorate_date_time_field
-      alias :decorate_date_field :decorate_date_time_field
 
       def to_hash
         if (hash = super).keys == [:_slug]

data/lib/locomotive/wagon/generators/site/cloned.rb

@@ -20,6 +20,10 @@ module Locomotive
             super
           end
 
+          def comment_gemfile
+            false
+          end
+
         end
       end
     end

data/lib/locomotive/wagon/tools/glob.rb

@@ -0,0 +1,86 @@
+# Original source code: https://raw.githubusercontent.com/alexch/rerun/master/lib/rerun/glob.rb
+# License here: https://github.com/alexch/rerun/blob/master/LICENSE
+#
+# based on http://cpan.uwinnipeg.ca/htdocs/Text-Glob/Text/Glob.pm.html#glob_to_regex_string-
+#
+module Locomotive
+  module Wagon
+    class Glob
+
+      NO_LEADING_DOT    = '(?=[^\.])'   # todo
+      START_OF_FILENAME = '(\A|\/)'     # beginning of string or a slash
+      END_OF_STRING     = '\z'
+
+      def initialize(glob_string)
+        @glob_string = glob_string
+      end
+
+      def to_regexp_string
+        chars = @glob_string.split('')
+        chars = smoosh(chars)
+
+        START_OF_FILENAME + parse(chars) + END_OF_STRING
+      end
+
+      def to_regexp
+        Regexp.new(to_regexp_string)
+      end
+
+      def smoosh(chars)
+        [].tap do |out|
+          until chars.empty?
+            char = chars.shift
+            if char == "*" and chars.first == "*"
+              chars.shift
+              chars.shift if chars.first == "/"
+              out.push("**")
+            else
+              out.push(char)
+            end
+          end
+        end
+      end
+
+      protected
+
+      def parse(chars)
+        curlies, escaping = 0, false
+        chars.map do |char|
+          if escaping
+            escaping = false
+            char
+          else
+            case char
+            when '**' then "([^/]+/)*"
+            when '*'  then ".*"
+            when "?"  then "."
+            when "."  then "\\."
+            when "{"
+              curlies += 1
+              "("
+            when "}"
+              if curlies > 0
+                curlies -= 1
+                ")"
+              else
+                char
+              end
+            when ","
+              if curlies > 0
+                "|"
+              else
+                char
+              end
+            when "\\"
+              escaping = true
+              "\\"
+            else
+              char
+            end
+          end
+        end.join
+      end
+
+    end
+  end
+end

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.0.0.rc6'
+    VERSION = '2.0.0.rc7'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'locomotivecms_common',  '~> 0.0.5'
   gem.add_dependency 'locomotivecms_coal',    '~> 1.0.0.rc4'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0.rc9'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0.rc10'
 
   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:
-      - 1eeb9688-e4f0-4a25-8bbb-8f79f152e003
+      - 6a1f30ca-31f3-42cd-87c1-36cc0f7d9afc
       X-Runtime:
-      - '0.019606'
+      - '0.030310'
       Content-Length:
       - '40'
     body:
       encoding: UTF-8
       string: '{"message":"Invalid email or password."}'
     http_version: 
-  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
+  recorded_at: Tue, 05 Jan 2016 02:33:23 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/"7d05e74769a4e3a32ddc19de535ace0d"
+      - W/"47c61faa89c576c552d7d76a2d254b73"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 14d9561a-97bf-4b9f-adad-488353d1dc13
+      - 327b70a6-11e6-4a17-b7cb-6c4218b7fb03
       X-Runtime:
-      - '0.070429'
+      - '0.045889'
       Content-Length:
       - '250'
     body:
       encoding: UTF-8
-      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}'
+      string: '{"_id":"568b2b74c36511390b0000c7","created_at":"2016-01-05T02:33:24Z","updated_at":"2016-01-05T02:33:24Z","name":"John","email":"john@doe.net","locale":"en","api_key":"f8d1951148b1c5881dda922708155e429f5dd6d1","super_admin":false,"local_admin":false}'
     http_version: 
-  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
+  recorded_at: Tue, 05 Jan 2016 02:33:24 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/"9ad33576c3616b662c8993aff5fb3c0e"
+      - W/"a4a0edc4d3d366b03b86b123b06c0a86"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 03f2dcd0-5c95-4859-b556-dd95643dbc07
+      - a15f71d8-757e-4c98-b5b5-4f4b57cb36c3
       X-Runtime:
-      - '0.018220'
+      - '0.019165'
       Content-Length:
       - '32'
     body:
       encoding: UTF-8
-      string: '{"token":"N-ddi-7z-19pXmkRRgq_"}'
+      string: '{"token":"kyprbq3YxVS4jMLXrjAK"}'
     http_version: 
-  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
+  recorded_at: Tue, 05 Jan 2016 02:33:24 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=N-ddi-7z-19pXmkRRgq_
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=kyprbq3YxVS4jMLXrjAK
     body:
       encoding: US-ASCII
       string: ''
@@ -123,7 +123,7 @@ http_interactions:
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - N-ddi-7z-19pXmkRRgq_
+      - kyprbq3YxVS4jMLXrjAK
       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/"46c8dfee2ff366b7a6ec27cea9505afb"
+      - W/"213b4ad78c990c366b689c2ab41e7c48"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - b43a45a2-0e95-4f9a-8abf-39b098fc98fc
+      - b62c3e97-56fe-4768-99c8-31b072a638e4
       X-Runtime:
-      - '0.028692'
+      - '0.020263'
       Content-Length:
       - '261'
     body:
       encoding: UTF-8
-      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}'
+      string: '{"_id":"568b2aa2c3651138ee000000","created_at":"2016-01-05T02:29:54Z","updated_at":"2016-01-05T02:29:54Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
+  recorded_at: Tue, 05 Jan 2016 02:33:24 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=N-ddi-7z-19pXmkRRgq_
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=kyprbq3YxVS4jMLXrjAK
     body:
       encoding: US-ASCII
       string: ''
@@ -162,7 +162,7 @@ http_interactions:
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - N-ddi-7z-19pXmkRRgq_
+      - kyprbq3YxVS4jMLXrjAK
       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/"46c8dfee2ff366b7a6ec27cea9505afb"
+      - W/"213b4ad78c990c366b689c2ab41e7c48"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - a6cc68eb-4757-4dc3-a9ca-bb2652068468
+      - 34abc7af-671f-48d5-ad42-041701b492c6
       X-Runtime:
-      - '0.017889'
+      - '0.019356'
       Content-Length:
       - '261'
     body:
       encoding: UTF-8
-      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}'
+      string: '{"_id":"568b2aa2c3651138ee000000","created_at":"2016-01-05T02:29:54Z","updated_at":"2016-01-05T02:29:54Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Fri, 04 Dec 2015 14:21:16 GMT
-recorded_with: VCR 2.9.3
+  recorded_at: Tue, 05 Jan 2016 02:33:24 GMT
+recorded_with: VCR 3.0.0