locomotivecms_wagon 1.4.0 → 1.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 610ad2611728515e34b9dc0aa880d165cbd4f439
-  data.tar.gz: b0ea22caa1d340f66625d33f62557014c75e8d15
+  metadata.gz: e7d570dba66f67cbb039827e8662d437905ef855
+  data.tar.gz: fd86e0b2507280c1046bad99a730916b199c1b33
 SHA512:
-  metadata.gz: 473b0954c4a345d62cf62bce29cff96383d9f4efad845a800fcc8dac01855b9996c89412008f1887661b5761bf1a4469535343035e34aded158b0227332824bb
-  data.tar.gz: aed80677e2a937b2c9deced219aa1ef277f2cf5ce1f1b175a31d7f8a44a4b8c49af0a9c7d4867e44ad90fd11fe453877b565759608aef9a662a574d22efacc1d
+  metadata.gz: 7debdfefd1c0e609f8c022970d7725e436248e53d67196bdf3427b64d223dc1bd600665d30b1d5acb43a3407e7c3ad1a864df08d6657f7a071beb6d1f1e1857e
+  data.tar.gz: 852a9e0f2405d4e51509ff154da6694b84e662824d95768411f3b98f2b842568621444c62848fbc2b2674d1666c4273cfcb23ccb309e47cc137321b6f79e5f50

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.1.1

data/Gemfile

@@ -7,7 +7,11 @@ 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 'locomotivecms_mounter', github: 'locomotivecms/mounter', ref: '6025c4a', require: false
 
+gem 'rb-fsevent', '~> 0.9.1'
 
-gem 'rb-fsevent', '~> 0.9.1'
+group :test do
+  gem 'pry'
+  gem 'coveralls', require: false
+end

data/README.md

@@ -1,5 +1,11 @@
 # LocomotiveCMS::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.png)](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.png)](https://coveralls.io/r/locomotivecms/wagon)
+
 Wagon is the official site generator for the LocomotiveCMS engine powered by all the efficient and modern HTML development tools (Haml, SASS, Compass, Less).
 
 ## Documentation
@@ -31,7 +37,7 @@ Please, visit the documentation website of LocomotiveCMS.
 
 #### Run the server with a default site
 
-    $ bundle exec bin/wagon server <path to the mounter gem>/spec/fixtures/default
+    $ bundle exec bin/wagon serve <path to the mounter gem>/spec/fixtures/default
 
 #### Push a site
 

data/bin/wagon

@@ -2,6 +2,9 @@
 
 # needed if you launch it without bundler
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../vendor'))
+
+$stdout.sync = true
 
 require 'locomotive/wagon'
 require 'locomotive/wagon/cli'

data/generators/blank/Gemfile.tt

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-# ruby '1.9.3'
-
 gem 'locomotivecms_wagon', '<%= config[:version] -%>'
 
 group :development do
@@ -9,7 +7,7 @@ group :development do
   gem 'rb-fsevent', '~> 0.9.1', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
 
   # Unix
-  gem 'therubyracer', require: 'v8', platforms: :ruby
+  gem 'therubyracer', require: 'v8', platforms: :ruby unless RUBY_PLATFORM.include?('darwin')
   gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM.include?('linux') && 'rb-inotify'
 
   # Windows

data/generators/blank/config/site.yml.tt

@@ -1,12 +1,12 @@
 # The name of this site
-# This text displays in the back-office and 
+# This text displays in the back-office and
 # can be used in templates through the site.name global variable
-name: <%= config[:name] %>
+name: "<%= config[:name] %>"
 
 # The site's subdomain
 # This option is for sites on multi-site engines
 # The value determines where the site can be accessed under the engine's primary domain
-# subdomain: sample
+subdomain: <%= config[:name].parameterize %>
 
 # An array of domain aliases for the site
 # This option is for sites on multi-site engines

data/generators/bootstrap/config/site.yml.tt

@@ -1,12 +1,12 @@
 # The name of this site
-# This text displays in the back-office and 
+# This text displays in the back-office and
 # can be used in templates through the site.name global variable
-name: <%= config[:name] %>
+name: "<%= config[:name] %>"
 
 # The site's subdomain
 # This option is for sites on multi-site engines
 # The value determines where the site can be accessed under the engine's primary domain
-# subdomain: sample
+subdomain: <%= config[:name].parameterize %>
 
 # An array of domain aliases for the site
 # This option is for sites on multi-site engines

data/generators/bootstrap3/Gemfile.tt

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-# ruby '1.9.3'
-
 gem 'locomotivecms_wagon', '<%= config[:version] -%>'
 
 group :development do
@@ -9,7 +7,7 @@ group :development do
   gem 'rb-fsevent', '~> 0.9.1', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
 
   # Unix
-  gem 'therubyracer', require: 'v8', platforms: :ruby
+  gem 'therubyracer', require: 'v8', platforms: :ruby unless RUBY_PLATFORM.include?('darwin')
   gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM.include?('linux') && 'rb-inotify'
 
   # Windows

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

@@ -5,13 +5,13 @@ published: true
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8"> 
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <meta charset="utf-8">
-    <title>Bootply.com - Bootstrap 3 Template</title>
-    <meta name="generator" content="Bootply" />
+    <title>{{ site.name }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    {{ 'bootstrap.css' | stylesheet_tag }}
-    {{ 'bootstrap-glyphicons.css' | stylesheet_tag }}
+
+    {{ 'application.css' | stylesheet_tag }}
+
     <!--[if lt IE 9]>
       <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
@@ -20,55 +20,13 @@ published: true
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/samples/apple-touch-icon-114x114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/samples/apple-touch-icon-72x72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="/samples/apple-touch-icon-precomposed.png">
-    <!-- CSS code from Bootply.com editor -->
-    <style type="text/css">
-      @media screen and (min-width: 992px) {
-        .the-icons li {
-          width: 12.5%;
-        }
-      }
-      .the-buttons > li {
-        float: left;
-        height: 80px;
-        padding: 10px;
-        border: 1px solid #ddd;
-        font-size: 12px;
-        line-height: 1.25;
-        text-align: center;
-        -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        box-sizing: border-box;
-        margin: 0 -1px -1px 0;
-      }
-      .the-icons .glyphicon {
-        display: block;
-        margin: 5px auto;
-        vertical-align: middle;
-        margin-right: 3px;
-        font-size: 24px;
-      }
-      .the-icons li {
-        float: left;
-        width: 100px;
-        height: 110px;
-        padding: 10px;
-        border: 1px solid #ddd;
-        font-size: 12px;
-        line-height: 1.25;
-        text-align: center;
-        -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        box-sizing: border-box;
-        margin: 0 -1px -1px 0;
-      }
-      .the-icons, .the-buttons {
-        list-style:none;
-      }
-    </style>
+
+    {% inline_editor %}
+
   </head>
-  <body>        
+  <body>
     <div class="container">
-      <h1>Bootstrap 3 Template</h1>
+      <h1>{{ page.title }}</h1>
       <p class="lead">A Full Featured Example</p>
 
       <!-- Typography
@@ -196,10 +154,10 @@ published: true
           <div class="row">
             <div class="col-lg-9 col-sm-6"><div class="well">col-lg-9 / col-sm-6</div></div>
             <div class="col-lg-3 col-sm-6"><div class="well">col-lg-3 / col-sm-6</div></div>
-          </div>  
+          </div>
         </div>
       </section>
-        
+
       <!-- Bootstrap 3 Buttons
       ================================================== -->
       <section id="buttons">
@@ -209,7 +167,7 @@ published: true
         </div>
         <h2>Button Sizes (4)</h2>
         <ul class="the-buttons clearfix">
-            <li><a class="btn btn-xs btn-primary" href="#">btn-xs</a></li>  
+            <li><a class="btn btn-xs btn-primary" href="#">btn-xs</a></li>
             <li><a class="btn btn-sm btn-primary" href="#">btn-sm</a></li>
             <li><a class="btn btn-primary" href="#">btn</a></li>
             <li><a class="btn btn-lg btn-primary" href="#">btn-lg</a></li>
@@ -223,7 +181,7 @@ published: true
           <li><a class="btn btn-warning" href="#">Warning</a></li>
           <li><a class="btn btn-danger" href="#">Danger</a></li>
           <li><a class="btn btn-primary disabled" href="#">Disabled</a></li>
-          <li><a class="btn btn-link" href="#">Link</a></li>  
+          <li><a class="btn btn-link" href="#">Link</a></li>
           <li>
             <!-- Single button -->
             <div class="btn-group">
@@ -415,7 +373,7 @@ published: true
           </ul>
         </div>
       </section>
-        
+
       <!-- Forms
       ================================================== -->
       <section id="forms">
@@ -689,7 +647,7 @@ published: true
             </div>
           </div>
           <br>
-          
+
         <!-- Panel & ListGroups
         ================================================== -->
         <hr>
@@ -748,20 +706,20 @@ published: true
               </div>
             </div>
           </div>
-          
+
         <!-- Well Sizes
         ================================================== -->
         <hr>
           <h2>Well Sizes</h2>
           <div class="row">
             <div class="col-lg-12">
-               <div class="well well-sm"> 
+               <div class="well well-sm">
                   .well-sm
-                </div>      
-                <div class="well"> 
+                </div>
+                <div class="well">
                   .well
                 </div>
-               <div class="well well-lg"> 
+               <div class="well well-lg">
                   .well-lg
                 </div>
             </div>

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

@@ -7,66 +7,24 @@ published: true
   %head
     %meta{content: "text/html; charset=UTF-8", "http-equiv" => "content-type"}/
     %meta{charset: "utf-8"}/
-    %title Bootply.com - Bootstrap 3 Template
-    %meta{content: "Bootply", name: "generator"}/
+    %title {{ site.name }}
     %meta{content: "width=device-width, initial-scale=1, maximum-scale=1", name: "viewport"}/
-  %body
-    %p
-      {{ 'bootstrap.css' | stylesheet_tag }}
-      /[if lt IE 9]
-        <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
-      %link{rel: "shortcut icon", href: "/samples/favicon.png"}/
-      %link{rel: "apple-touch-icon-precomposed", sizes: "144x144", href: "/samples/apple-touch-icon-144x144-precomposed.png"}/
-      %link{rel: "apple-touch-icon-precomposed", sizes: "114x114", href: "/samples/apple-touch-icon-114x114-precomposed.png"}/
-      %link{rel: "apple-touch-icon-precomposed", sizes: "72x72", href: "/samples/apple-touch-icon-72x72-precomposed.png"}/
-      %link{rel: "apple-touch-icon-precomposed", href: "/samples/apple-touch-icon-precomposed.png"}/
 
-      / CSS code from Bootply.com editor
-      :css
-        @media screen and (min-width: 992px) {
-          .the-icons li {
-            width: 12.5%;
-          }
-        }
-        .the-buttons > li {
-          float: left;
-          height: 80px;
-          padding: 10px;
-          border: 1px solid #ddd;
-          font-size: 12px;
-          line-height: 1.25;
-          text-align: center;
-          -webkit-box-sizing: border-box;
-          -moz-box-sizing: border-box;
-          box-sizing: border-box;
-          margin: 0 -1px -1px 0;
-        }
-        .the-icons .glyphicon {
-          display: block;
-          margin: 5px auto;
-          vertical-align: middle;
-          margin-right: 3px;
-          font-size: 24px;
-        }
-        .the-icons li {
-          float: left;
-          width: 100px;
-          height: 110px;
-          padding: 10px;
-          border: 1px solid #ddd;
-          font-size: 12px;
-          line-height: 1.25;
-          text-align: center;
-          -webkit-box-sizing: border-box;
-          -moz-box-sizing: border-box;
-          box-sizing: border-box;
-          margin: 0 -1px -1px 0;
-        }
-        .the-icons, .the-buttons {
-          list-style:none;
-        }
+    {{ 'application.css' | stylesheet_tag }}
+
+    /[if lt IE 9]
+      <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    %link{rel: "shortcut icon", href: "/samples/favicon.png"}/
+    %link{rel: "apple-touch-icon-precomposed", sizes: "144x144", href: "/samples/apple-touch-icon-144x144-precomposed.png"}/
+    %link{rel: "apple-touch-icon-precomposed", sizes: "114x114", href: "/samples/apple-touch-icon-114x114-precomposed.png"}/
+    %link{rel: "apple-touch-icon-precomposed", sizes: "72x72", href: "/samples/apple-touch-icon-72x72-precomposed.png"}/
+    %link{rel: "apple-touch-icon-precomposed", href: "/samples/apple-touch-icon-precomposed.png"}/
+
+    {% inline_editor %}
+
+  %body
     .container
-      %h1 Bootstrap 3 Template
+      %h1 {{ page.title }}
       %p.lead A Full Featured Example
       /
         Typography

data/generators/bootstrap3/config/deploy.yml

@@ -1,15 +1,15 @@
-development:
-  host: dev.example.com
-  email: john@doe.net
-  password: apassword
-  # api_key: <your api key here>
-staging:
-  host: staging.example.com
-  email: john@doe.net
-  password: apassword
-  # api_key: <your api key here>
-production:
-  host: www.example.com
-  email: john@doe.net
-  password: apassword
-  # api_key: <your api key here>
+# development:
+#   host: dev.example.com
+#   email: john@doe.net
+#   password: apassword
+#   # api_key: <your api key here>
+# staging:
+#   host: staging.example.com
+#   email: john@doe.net
+#   password: apassword
+#   # api_key: <your api key here>
+# production:
+#   host: www.example.com
+#   email: john@doe.net
+#   password: apassword
+#   # api_key: <your api key here>

data/generators/bootstrap3/config/site.yml.tt

@@ -1,12 +1,12 @@
 # The name of this site
 # This text displays in the back-office and
 # can be used in templates through the site.name global variable
-name: <%= config[:name] %>
+name: "<%= config[:name] %>"
 
 # The site's subdomain
 # This option is for sites on multi-site engines
 # The value determines where the site can be accessed under the engine's primary domain
-# subdomain: sample
+subdomain: <%= config[:name].parameterize %>
 
 # An array of domain aliases for the site
 # This option is for sites on multi-site engines