locomotivecms_wagon 1.0.1 → 1.0.2

data/Rakefile

@@ -36,7 +36,7 @@ namespace :development do
 
     FileUtils.rm_rf(File.join(File.dirname(__FILE__), 'site'))
     VCR.use_cassette('pull') do
-      exit unless Locomotive::Wagon.clone('site', {'host' => 'http://locomotive.engine.dev:3000'}, 'email' => 'admin@locomotivecms.com', 'password' => 'locomotive')
+      exit unless Locomotive::Wagon.clone('site', '.', host: 'http://locomotive.engine.dev:3000', email: 'admin@locomotivecms.com', password: 'locomotive')
     end
 
     Locomotive::Wagon.push('site', {'host' => 'http://locomotive.engine.dev:3000'}, 'email' => 'admin@locomotivecms.com', 'password' => 'locomotive', 'force' => true, 'data' => true)

data/generators/blank/Gemfile.tt

@@ -6,9 +6,10 @@ gem 'locomotivecms_wagon', '<%= config[:version] -%>'
 
 group :development do
   # Mac OS X
-  gem 'rb-fsevent', '~> 0.9.1', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
+  gem 'rb-fsevent', '~> 0.9.1', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
 
-  # TODO: Linux
+  # Unix
+  gem 'therubyracer', require: 'v8', platforms: :ruby
 
   # TODO: Windows
 end

data/generators/bootstrap/Gemfile.tt

@@ -6,9 +6,10 @@ gem 'locomotivecms_wagon', '<%= config[:version] -%>'
 
 group :development do
   # Mac OS X
-  gem 'rb-fsevent', '~> 0.9.1', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
+  gem 'rb-fsevent', '~> 0.9.1', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
 
-  # TODO: Linux
+  # Unix
+  gem 'therubyracer', require: 'v8', platforms: :ruby
 
   # TODO: Windows
 end

data/generators/cloned/Gemfile.tt

@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# ruby '1.9.3'
+
+gem 'locomotivecms_wagon', '<%= config[:version] -%>'
+
+group :development do
+  # Mac OS X
+  gem 'rb-fsevent', '~> 0.9.1', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
+
+  # Unix
+  gem 'therubyracer', require: 'v8', platforms: :ruby
+
+  # TODO: Windows
+end
+
+group :misc do
+  # Add your extra gems here
+  # gem 'susy', require: 'susy'
+  # gem 'redcarpet', require: 'redcarpet'
+end

data/generators/cloned/app/content_types/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/cloned/app/views/pages/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/cloned/app/views/snippets/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/cloned/config/deploy.yml.tt

@@ -0,0 +1,4 @@
+production:
+  host: <%= config[:host] %>
+  email: <%= config[:email] %>
+  password: <%= config[:password] %>

data/generators/cloned/config.ru

@@ -0,0 +1,3 @@
+require 'locomotive/wagon/standalone_server'
+
+run Locomotive::Wagon::StandaloneServer.new(File.expand_path('.'))

data/generators/cloned/data/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/cloned/public/fonts/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/cloned/public/images/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/cloned/public/javascripts/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/cloned/public/samples/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/cloned/public/stylesheets/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/foundation/Gemfile.tt

@@ -8,7 +8,8 @@ group :development do
   # Mac OS X
   gem 'rb-fsevent', '~> 0.9.1', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
 
-  # TODO: Linux
+  # Unix
+  gem 'therubyracer', require: 'v8', platforms: :ruby
 
   # TODO: Windows
 end

data/generators/foundation/app/views/pages/index.liquid

@@ -12,9 +12,9 @@ published: true
   <title>{{ page.title }}</title>
 
   {{ 'normalize.css' | stylesheet_tag }}
-  
+
   {{ 'foundation.css' | stylesheet_tag }}
-  
+
   {{ 'vendor/custom.modernizr.js' | javascript_tag }}
 
 </head>
@@ -108,43 +108,43 @@ published: true
 
   <script>
   document.write('<script src=' +
-  ('__proto__' in {} ? '{{ site.root }}javascripts/vendor/zepto' : '{{ site.root }}javascripts/vendor/jquery') +
-  '.js><\/script>')
+  ('__proto__' in {} ? '{{ 'vendor/zepto.js' | javascript_url }}' : '{{ 'vendor/jquery.js' | javascript_url }}') +
+  '><\/script>')
   </script>
   {{ 'foundation.min.js' | javascript_tag }}
-  
+
   <!--
-  
+
   {{ 'foundation/foundation.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.alerts.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.clearing.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.cookie.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.dropdown.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.forms.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.joyride.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.magellan.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.orbit.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.placeholder.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.reveal.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.section.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.tooltips.js' | javascript_tag }}
-  
+
   {{ 'foundation/foundation.topbar.js' | javascript_tag }}
-  
+
   -->
-  
+
   <script>
     $(document).foundation();
   </script>

data/generators/foundation/app/views/pages/index.liquid.haml

@@ -12,9 +12,9 @@ published: true
     %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}/
     %title {{ page.title }}
     {{ 'normalize.css' | stylesheet_tag }}
-    
+
     {{ 'foundation.css' | stylesheet_tag }}
-    
+
     {{ 'vendor/custom.modernizr.js' | javascript_tag }}
   %body
     .row
@@ -86,45 +86,44 @@ published: true
               %br/
             us on Twitter if you have questions. If you build something with this we'd love to see it (and send you a totally boss sticker).
     {% endblock %}
-    
+
     {% include footer %}
 
     :javascript
       document.write('<script src=' +
-      ('__proto__' in {} ? '{{ site.root }}javascripts/vendor/zepto' : '{{ site.root }}javascripts/vendor/jquery') +
-      '.js><\/script>')
+      ('__proto__' in {} ? '{{ 'vendor/zepto.js' | javascript_url }}' : '{{ 'vendor/jquery.js' | javascript_url }}') +
+      '><\/script>')
 
     {{ 'foundation.min.js' | javascript_tag }}
 
     /
       {{ 'foundation/foundation.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.alerts.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.clearing.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.cookie.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.dropdown.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.forms.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.joyride.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.magellan.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.orbit.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.placeholder.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.reveal.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.section.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.tooltips.js' | javascript_tag }}
-      
+
       {{ 'foundation/foundation.topbar.js' | javascript_tag }}
-      
+
     :javascript
       $(document).foundation();
-  

data/lib/locomotive/wagon/cli.rb

@@ -118,6 +118,7 @@ module Locomotive
 
         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'
         def init(name, path = '.')
           require 'locomotive/wagon/generators/site'
           generator = Locomotive::Wagon::Generators::Site.get(options[:template])
@@ -125,13 +126,27 @@ module Locomotive
             say "Unknown site template '#{options[:template]}'", :red
           else
             begin
-              Locomotive::Wagon.init(name, path, generator)
+              if Locomotive::Wagon.init(name, path, generator)
+                self.print_next_instructions_when_site_created(name, path)
+              end
             rescue GeneratorException => e
-              say e.message, :red
+              self.print_exception(e, options[:verbose])
             end
           end
         end
 
+        desc 'clone NAME HOST EMAIL PASSWORD [PATH]', 'Clone a remote LocomotiveCMS site'
+        method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
+        def clone(name, host, email, password, path = '.')
+          begin
+            if Locomotive::Wagon.clone(name, path, host: host, email: email, password: password)
+              self.print_next_instructions_when_site_created(name, path)
+            end
+          rescue Exception => e
+            self.print_exception(e, options[:verbose])
+          end
+        end
+
         desc 'generate TYPE ...ARGS', 'Generate resources (content_types, page, snippets) for a LocomotiveCMS site'
         subcommand 'generate', Generate
 
@@ -165,13 +180,14 @@ module Locomotive
         method_option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only push the resource(s) passed in argument'
         method_option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Force the push of a resource'
         method_option :data, aliases: '-d', type: 'boolean', default: false, desc: 'Push the content entries and the editable elements (by default, they are not)'
+        method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
         def push(env, path = '.')
           if check_path!(path)
             if connection_info = self.retrieve_connection_info(env, path)
               begin
                 Locomotive::Wagon.push(path, connection_info, options)
               rescue Exception => e
-                say e.message, :red
+                self.print_exception(e, options[:verbose])
               end
             end
           end
@@ -179,15 +195,14 @@ module Locomotive
 
         desc 'pull ENV [PATH]', 'Pull a site from a remote LocomotiveCMS engine'
         method_option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only pull the resource(s) passed in argument'
-        # method_option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Force the push of a resource'
-        # method_option :data, aliases: '-d', type: 'boolean', default: false, desc: 'Push the content entries and the editable elements (by default, they are not)'
+        method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
         def pull(env, path = '.')
           if check_path!(path)
             if connection_info = self.retrieve_connection_info(env, path)
               begin
                 Locomotive::Wagon.pull(path, connection_info, options)
               rescue Exception => e
-                say e.message, :red
+                self.print_exception(e, options[:verbose])
               end
             end
           end
@@ -208,6 +223,29 @@ module Locomotive
 
         protected
 
+        # Print a nice message when a site has been created.
+        #
+        # @param [ String ] name The name of the site
+        # @param [ String ] path The path of the local site
+        #
+        def print_next_instructions_when_site_created(name, path)
+          say "\nCongratulations, your site \"#{name}\" has been created successfully !", :green
+          say 'Next steps:', :bold
+          say "\tcd #{path}/#{name}\n\tbundle install\n\tbundle exec wagon serve\n\topen http://0.0.0.0:3333"
+        end
+
+        # Print the exception.
+        #
+        # @param [ Object ] exception The raised exception
+        # @param [ Boolean ] verbose Print the full backtrace if true
+        #
+        def print_exception(exception, verbose)
+          say exception.message, :red
+          if verbose
+            say "\t" + exception.backtrace.join("\n\t")
+          end
+        end
+
         # From a site specified by a path, retrieve the information of the connection
         # for a environment located in the config/deploy.yml file of the site.
         #
@@ -217,10 +255,11 @@ module Locomotive
         # @return [ Hash ] The information of the connection or nil if errors
         #
         def retrieve_connection_info(env, path)
+          require 'active_support/core_ext/hash'
           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]
+            connection_info = YAML::load(File.open(path_to_deploy_file).read)[env.to_s].with_indifferent_access
 
             if connection_info.nil?
               raise "No #{env.to_s} environment found in the config/deploy.yml file"

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

@@ -0,0 +1,23 @@
+module Locomotive
+  module Wagon
+    module Generators
+      module Site
+
+        # Template used when the remote LocomotiveCMS site is cloned
+        # in order to have the minimal files.
+        class Cloned < Base
+
+          argument :connection_info
+
+          def copy_sources
+            directory('.', self.destination, { recursive: true }, {
+              name:     self.name,
+              version:  Locomotive::Wagon::VERSION
+            }.merge(self.connection_info))
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -97,3 +97,4 @@ require 'locomotive/wagon/generators/site/blank'
 require 'locomotive/wagon/generators/site/bootstrap'
 require 'locomotive/wagon/generators/site/foundation'
 require 'locomotive/wagon/generators/site/unzip'
+require 'locomotive/wagon/generators/site/cloned'

data/lib/locomotive/wagon/liquid/filters/html.rb

@@ -4,26 +4,60 @@ module Locomotive
       module Filters
         module Html
 
+          # Returns a link tag that browsers and news readers can use to auto-detect an RSS or ATOM feed.
+          # input: url of the feed
+          # example:
+          #   {{ '/foo/bar' | auto_discovery_link_tag: 'rel:alternate', 'type:application/atom+xml', 'title:A title' }}
+          def auto_discovery_link_tag(input, *args)
+            options = args_to_options(args)
+
+            rel   = options[:rel] || 'alternate'
+            type  = options[:type] || Mime::Type.lookup_by_extension('rss').to_s
+            title = options[:title] || 'RSS'
+
+            %{<link rel="#{rel}" type="#{type}" title="#{title}" href="#{input}" />}
+          end
+
+          # Write the url of a theme stylesheet
+          # input: name of the css file
+          def stylesheet_url(input)
+            return '' if input.nil?
+
+            input = "/stylesheets/#{input}" unless input =~ /^(\/|https?:)/
+
+            input = "#{input}.css" unless input.ends_with?('.css')
+
+            input
+          end
+
           # Write the link to a stylesheet resource
           # input: url of the css file
           def stylesheet_tag(input, media = 'screen')
             return '' if input.nil?
 
-            input = "/stylesheets/#{input}" unless input =~ /^(\/|http:)/
-
-            input = "#{input}.css" unless input.ends_with?('.css')
+            input = stylesheet_url(input)
 
             %{<link href="#{input}" media="#{media}" rel="stylesheet" type="text/css" />}
           end
 
+          # Write the url to javascript resource
+          # input: name of the javascript file
+          def javascript_url(input)
+            return '' if input.nil?
+
+            input = "/javascripts/#{input}" unless input =~ /^(\/|https?:)/
+
+            input = "#{input}.js" unless input.ends_with?('.js')
+
+            input
+          end
+
           # Write the link to javascript resource
           # input: url of the javascript file
           def javascript_tag(input)
             return '' if input.nil?
 
-            input = "/javascripts/#{input}" unless input =~ /^(\/|http:)/
-
-            input = "#{input}.js" unless input.ends_with?('.js')
+            input = javascript_url(input)
 
              %{<script src="#{input}" type="text/javascript"></script>}
           end
@@ -33,9 +67,7 @@ module Locomotive
           def image_tag(input, *args)
             image_options = inline_options(args_to_options(args))
 
-            input = "/images/#{input}" unless input =~ /^(\/|http:)/
-
-            "<img src=\"#{File.join('/', get_url_from_asset(input))}\" #{image_options}/>"
+            "<img src=\"#{get_url_from_asset(input)}\" #{image_options}>"
           end
 
           # Write a theme image tag

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/lib/locomotive/wagon.rb

@@ -61,12 +61,12 @@ module Locomotive
 
         writer = Locomotive::Mounter::Writer::Api.instance
 
-        connection_info['uri'] = "#{connection_info.delete('host')}/locomotive/api"
+        connection_info[:uri] = "#{connection_info.delete(:host)}/locomotive/api"
 
         _options = { mounting_point: reader.mounting_point, console: true }.merge(options).symbolize_keys
         _options[:only] = _options.delete(:resources)
 
-        writer.run!(_options.merge(connection_info))
+        writer.run!(_options.merge(connection_info).with_indifferent_access)
       end
     end
 
@@ -80,9 +80,9 @@ module Locomotive
     def self.pull(path, connection_info, options = {})
       self.require_mounter(path)
 
-      Bundler.require 'misc'
+      Bundler.require 'misc' unless options[:disable_misc]
 
-      connection_info['uri'] = "#{connection_info.delete('host')}/locomotive/api"
+      connection_info[:uri] = "#{connection_info.delete(:host)}/locomotive/api"
 
       _options = { console: true }.merge(options)
       _options[:only] = _options.delete(:resources)
@@ -92,29 +92,30 @@ module Locomotive
 
       writer = Locomotive::Mounter::Writer::FileSystem.instance
       writer.run!(mounting_point: reader.mounting_point, target_path: path)
-    rescue Exception => e
-      puts e.backtrace
     end
 
-    def self.clone(path, connection_info, options = {})
-      if File.exists?(path)
+    # Clone a site from a remote LocomotiveCMS engine.
+    #
+    # @param [ String ] name Name of the site (arbitrary)
+    # @param [ String ] path The root path where the site will be cloned
+    # @param [ Hash ] connection_info The host, email and password needed to access the remote engine
+    # @param [ Hash ] options The options for the API reader
+    #
+    def self.clone(name, path, connection_info, options = {})
+      target_path = File.expand_path(File.join(path, name))
+
+      if File.exists?(target_path)
         puts "Path already exists. If it's an existing site, you might want to pull instead of clone."
         return false
       end
-      require 'locomotive/mounter'
-
-      connection_info['uri'] = "#{connection_info.delete('host')}/locomotive/api"
 
-      _options = options.dup
-      _options[:only] = _options.delete(:resources)
+      # generate an almost blank site
+      require 'locomotive/wagon/generators/site'
+      generator = Locomotive::Wagon::Generators::Site::Cloned
+      generator.start [name, path, connection_info]
 
-      reader = Locomotive::Mounter::Reader::Api.instance
-      reader.run!(_options.merge(connection_info))
-
-      writer = Locomotive::Mounter::Writer::FileSystem.instance
-      writer.run!(mounting_point: reader.mounting_point, target_path: path)
-    # rescue Exception => e
-    #   puts e.backtrace
+      # pull the remote site
+      self.pull(target_path, options.merge(connection_info).with_indifferent_access, { disable_misc: true })
     end
 
     # Destroy a remote site

data/locomotivecms_wagon.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'httmultiparty',         '0.3.8'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '1.0.2'
+  gem.add_dependency 'locomotivecms_mounter', '1.0.4'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

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

@@ -12,6 +12,8 @@ title: Home page
     %meta{ :content => "{{ site.meta_description }}", :name => "description" }
     %meta{ :content => "{{ site.meta_keywords }}", :name => "keywords" }
 
+    {{ '/foo/bar' | auto_discovery_link_tag: 'rel:alternate', 'type:application/atom+xml', 'title:A title' }}
+
     / Le HTML5 shim, for IE6-8 support of HTML elements
 
     /[if lt IE 9]
@@ -22,6 +24,7 @@ title: Home page
     / Le styles
     {{ 'reboot' | stylesheet_tag }}
     {{ 'application' | stylesheet_tag }}
+    %script{ :src => "{{ 'application.js' | javascript_url }}", :type => 'text/javascript' }
 
     %script{ :src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js', :type => 'text/javascript' }
 
@@ -30,7 +33,7 @@ title: Home page
   %body
     .container
       #menu
-        #nav
+        %ul#nav
           %li#home{ :class => "{% if page.fullpath == 'index' %}on{% endif %} link" }
             %a{ :href => '/' } Home
           {% nav site, no_wrapper: true, exclude: 'events' %}