locomotivecms_wagon 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf389fd19683084ab7f2c71ceb20bba27a863a8
-  data.tar.gz: 7fb14dffa20d08c0df5bcf5a887f84803de98e5d
+  metadata.gz: 610ad2611728515e34b9dc0aa880d165cbd4f439
+  data.tar.gz: b0ea22caa1d340f66625d33f62557014c75e8d15
 SHA512:
-  metadata.gz: a65598dd4dd41faddc22c6b358d06e0b821f8d212eea46f03977eded9cc3aad65a92de840b2302151719ffdeb8b8e329ed1212baf2e724f1d37703214b1927e1
-  data.tar.gz: 37eb257956b84207ac3bb598a4e24e739b99082540d9626234ac02e6b1f8a5050a66f780dd25e16bc88f3ed6ce1932e348a8b67d62e9dc739eb7f133979b6cd3
+  metadata.gz: 473b0954c4a345d62cf62bce29cff96383d9f4efad845a800fcc8dac01855b9996c89412008f1887661b5761bf1a4469535343035e34aded158b0227332824bb
+  data.tar.gz: aed80677e2a937b2c9deced219aa1ef277f2cf5ce1f1b175a31d7f8a44a4b8c49af0a9c7d4867e44ad90fd11fe453877b565759608aef9a662a574d22efacc1d

data/Gemfile

@@ -7,6 +7,7 @@ gemspec
 # gem 'locomotivecms-liquid', path: '../gems/liquid', require: false
 # gem 'locomotivecms-solid', path: '../gems/solid', require: false
 # gem 'locomotivecms_mounter', path: '../gems/mounter', require: false
+# gem 'locomotivecms_mounter', github: 'locomotivecms/mounter', ref: '34d24feeb8', require: false
 
 
 gem 'rb-fsevent', '~> 0.9.1'

data/lib/locomotive/wagon/cli.rb

@@ -117,10 +117,12 @@ module Locomotive
         end
 
         desc 'init NAME [PATH]', 'Create a brand new LocomotiveCMS site'
-        method_option :template, aliases: '-t', type: 'string', default: 'blank', desc: 'instead of building from a blank site, you can have a pre-fetched site with form a template (see the templates command)'
-        method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
+        method_option :template,  aliases: '-t', type: 'string', default: 'blank', desc: 'instead of building from a blank site, you can have a pre-fetched site with form a template (see the templates command)'
+        method_option :lib,       aliases: '-l', type: 'string', desc: 'Path to an external ruby lib or generator'
+        method_option :verbose,   aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
         def init(name, path = '.')
           require 'locomotive/wagon/generators/site'
+          require File.expand_path(options[:lib]) if options[:lib]
           generator = Locomotive::Wagon::Generators::Site.get(options[:template])
           if generator.nil?
             say "Unknown site template '#{options[:template]}'", :red
@@ -154,8 +156,10 @@ module Locomotive
         subcommand 'generate', Generate
 
         desc 'list_templates', 'List all the templates to create either a site or a content type'
+        method_option :lib, aliases: '-l', type: 'string', desc: 'Path to an external ruby lib or generator'
         def list_templates
           require 'locomotive/wagon/generators/site'
+          require File.expand_path(options[:lib]) if options[:lib]
           if Locomotive::Wagon::Generators::Site.empty?
             say 'No templates', :red
           else
@@ -260,10 +264,12 @@ module Locomotive
         #
         def retrieve_connection_info(env, path)
           require 'active_support/core_ext/hash'
+          require 'erb'
           connection_info = nil
           begin
             path_to_deploy_file = File.join(path, 'config', 'deploy.yml')
-            connection_info = YAML::load(File.open(path_to_deploy_file).read)[env.to_s].with_indifferent_access
+            env_parsed_deploy_file = ERB.new(File.open(path_to_deploy_file).read).result
+            connection_info = YAML::load(env_parsed_deploy_file)[env.to_s].with_indifferent_access
 
             if connection_info[:ssl] && !connection_info[:host].start_with?('https')
               connection_info[:host] = 'https://' + connection_info[:host]

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

@@ -14,6 +14,13 @@ module Locomotive
           argument :name
           argument :target_path
 
+          def copy_sources
+            directory('.', self.destination, { recursive: true }, {
+              name:     self.name,
+              version:  Locomotive::Wagon::VERSION
+            })
+          end
+
           def self.source_root
             File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'generators', self.name.demodulize.underscore)
           end

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

@@ -5,13 +5,6 @@ module Locomotive
 
         class Blank < Base
 
-          def copy_sources
-            directory('.', self.destination, { recursive: true }, {
-              name:     self.name,
-              version:  Locomotive::Wagon::VERSION
-            })
-          end
-          
           def choose_haml_over_html
             if yes?('Do you prefer HAML templates ?')
               remove_file File.join(self.destination, 'app/views/pages/index.liquid')

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

@@ -5,13 +5,6 @@ module Locomotive
 
         class Bootstrap2 < Base
 
-          def copy_sources
-            directory('.', self.destination, { recursive: true }, {
-              name:     self.name,
-              version:  Locomotive::Wagon::VERSION
-            })
-          end
-
           def choose_haml_over_html
             if yes?('Do you prefer HAML templates ?')
               remove_file File.join(self.destination, 'app/views/pages/index.liquid')

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

@@ -5,13 +5,6 @@ module Locomotive
 
         class Bootstrap3 < Base
 
-          def copy_sources
-            directory('.', self.destination, { recursive: true }, {
-              name:     self.name,
-              version:  Locomotive::Wagon::VERSION
-            })
-          end
-
           def choose_haml_over_html
             if yes?('Do you prefer HAML templates ?')
               remove_file File.join(self.destination, 'app/views/pages/index.liquid')

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

@@ -5,13 +5,6 @@ module Locomotive
 
         class Foundation < Base
 
-          def copy_sources
-            directory('.', self.destination, { recursive: true }, {
-              name:     self.name,
-              version:  Locomotive::Wagon::VERSION
-            })
-          end
-
           def choose_haml_over_html
             if yes?('Do you prefer HAML templates ?')
               remove_file File.join(self.destination, 'app/views/pages/index.liquid')

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.3.3'
+    VERSION = '1.4.0'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'httmultiparty',         '0.3.10'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '~> 1.3.3'
+  gem.add_dependency 'locomotivecms_mounter', '~> 1.4.0'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

data/spec/fixtures/default/app/views/pages/index.liquid.haml

@@ -95,6 +95,6 @@ title: Home page
 
         {% include footer %}
 
-        {% include a_complicated_one %}
+        {% include a_complicated-one %}
 
     {% google_analytics 'UA-20661758-1' %}

data/spec/fixtures/default/app/views/pages/music.liquid.haml

@@ -29,7 +29,7 @@ position: 2
 #is_listed{ listed: "{{ page.listed? }}" }
 
 #test_for_scope
-  {% with_scope _slug: "song-3" %}
+  {% with_scope _slug: "song-number-3" %}
   {% assign selected_songs = contents.songs.all %}
   {% endwith_scope %}
   {% for s in selected_songs %}

data/spec/integration/server/basic_spec.rb

@@ -35,12 +35,12 @@ describe Locomotive::Wagon::Server do
   end
 
   it 'shows a content type template ' do
-    get '/songs/song-1'
+    get '/songs/song-number-1'
     last_response.body.should =~ /Song #1/
   end
 
   it 'renders a page under a templatized one' do
-    get '/songs/song-1/band'
+    get '/songs/song-number-1/band'
     last_response.body.should =~ /Song #1/
     last_response.body.should =~ /Leader: Eddie/
   end
@@ -61,7 +61,7 @@ describe Locomotive::Wagon::Server do
 
   it 'translates a page with link_to tags inside' do
     get '/fr/notre-musique'
-    last_response.body.should =~ /<h3><a href="\/fr\/songs\/song-8">Song #8<\/a><\/h3>/
+    last_response.body.should =~ /<h3><a href="\/fr\/songs\/song-number-8">Song #8<\/a><\/h3>/
     last_response.body.should =~ /Propulsé par/
   end
 

data/spec/integration/server/liquid_spec.rb

@@ -13,7 +13,7 @@ describe Locomotive::Wagon::Server do
   end
 
   it "converts {{ page.templatized? }} => true on templatized page" do
-    get '/songs/song-1'
+    get '/songs/song-number-1'
     last_response.body.should =~ /templatized=.true./
   end
 
@@ -28,12 +28,12 @@ describe Locomotive::Wagon::Server do
   end
 
   it "provides an access to page's content_type collection" do
-    get '/songs/song-1'
+    get '/songs/song-number-1'
     last_response.body.should =~ /content_type_size=.8./
   end
 
   it "provides count alias on collections" do
-    get '/songs/song-1'
+    get '/songs/song-number-1'
     last_response.body.should =~ /content_type_count=.8./
   end
 
@@ -56,12 +56,12 @@ describe Locomotive::Wagon::Server do
 
     it "writes a link to a templatized page" do
       get '/events'
-      last_response.body.should =~ /<a href="\/songs\/song-1">Song #1<\/a>/
+      last_response.body.should =~ /<a href="\/songs\/song-number-1">Song #1<\/a>/
     end
 
     it "writes a link to a templatized page with a different handle" do
       get '/events'
-      last_response.body.should =~ /<a href="\/songs\/song-8">Song #8<\/a>/
+      last_response.body.should =~ /<a href="\/songs\/song-number-8">Song #8<\/a>/
     end
 
   end
@@ -71,7 +71,7 @@ describe Locomotive::Wagon::Server do
     it "evaluates collection when called all inside of scope" do
       get '/music'
       last_response.body.should =~ /<p class=.scoped_song.>Song #3/
-      last_response.body.should =~ /<p class=.scoped_song_link.>\s+<a href=.\/songs\/song-3.>Song #3/m
+      last_response.body.should =~ /<p class=.scoped_song_link.>\s+<a href=.\/songs\/song-number-3.>Song #3/m
     end
 
     it "size of evaluated unscoped collection equal to unevaluated one" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -213,14 +213,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement