locomotivecms_wagon 2.0.0.rc2 → 2.0.0.rc3

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

@@ -18,23 +18,33 @@ module Locomotive::Wagon
     include ApiConcern
     include DeployFileConcern
     include InstrumentationConcern
+    include SpinnerConcern
 
     def self.pull(env, path, options, shell)
       self.new(env, path, options, shell).pull
     end
 
     def pull
-      PullLogger.new if options[:verbose]
+      if options[:verbose]
+        PullLogger.new
+        _pull
+      else
+        show_wait_spinner('Pulling...') { _pull }
+      end
+    end
 
+    private
+
+    def _pull
       api_client = api_site_client(connection_information)
       site = api_client.current_site.get
 
       each_resource do |klass|
         klass.pull(api_client, site, path)
       end
-    end
 
-    private
+      print_result_message
+    end
 
     def each_resource
       RESOURCES.each do |name|
@@ -50,6 +60,11 @@ module Locomotive::Wagon
       read_deploy_settings(self.env, self.path)
     end
 
+    def print_result_message
+      shell.say "\n\nThe templates, theme assets and content have been pulled from the remote version.", :green
+      true
+    end
+
   end
 
 end

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

@@ -22,6 +22,7 @@ module Locomotive::Wagon
     include DeployFileConcern
     include SteamConcern
     include InstrumentationConcern
+    include SpinnerConcern
 
     attr_accessor :platform_url, :credentials
 
@@ -30,8 +31,17 @@ module Locomotive::Wagon
     end
 
     def push
-      PushLogger.new if options[:verbose]
+      if options[:verbose]
+        PushLogger.new
+        _push
+      else
+        show_wait_spinner('Deploying...') { _push }
+      end
+    end
+
+    private
 
+    def _push
       require_misc_gems
 
       api_client = build_api_site_client(connection_information)
@@ -43,9 +53,9 @@ module Locomotive::Wagon
       each_resource do |klass|
         klass.push(api_client, steam_services, content_assets_pusher, remote_site)
       end
-    end
 
-    private
+      print_result_message
+    end
 
     # To push all the other resources, the big requirement is to
     # have the same locales between the local site and the remote one.
@@ -96,7 +106,7 @@ module Locomotive::Wagon
       # get an instance of the Steam services in order to load the information about the site (SiteRepository)
       steam_services.current_site.tap do |site|
         # ask for a handle if not found (blank: random one)
-        site[:handle] ||= shell.try(:ask, "What is the handle of your site?")
+        site[:handle] ||= shell.try(:ask, "What is the handle of your site? (default: a random one)")
 
         # create the site
         attributes = SiteDecorator.new(site).to_hash
@@ -150,6 +160,20 @@ module Locomotive::Wagon
       Bundler.require 'misc'
     end
 
+    def print_result_message
+      shell.say "\n\nYour site has been deployed.", :green
+
+      if remote_site.respond_to?(:preview_url)
+        shell.say "\nTo preview your site, visit: #{remote_site.preview_url.light_white}"
+      end
+
+      if remote_site.respond_to?(:sign_in_url)
+        shell.say "To edit the content of your site, visit: #{remote_site.sign_in_url.light_white}"
+      end
+
+      true
+    end
+
   end
 
 end

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

@@ -13,30 +13,40 @@ require_relative_all  'sync_sub_commands'
 
 module Locomotive::Wagon
 
-  class SyncCommand < Struct.new(:env, :path, :options)
+  class SyncCommand < Struct.new(:env, :path, :options, :shell)
 
     RESOURCES = %w(pages content_entries translations).freeze
 
     include ApiConcern
     include DeployFileConcern
     include InstrumentationConcern
+    include SpinnerConcern
 
-    def self.sync(env, path, options)
-      self.new(env, path, options).sync
+    def self.sync(env, path, options, shell)
+      self.new(env, path, options, shell).sync
     end
 
     def sync
-      SyncLogger.new if options[:verbose]
+      if options[:verbose]
+        SyncLogger.new
+        _sync
+      else
+        show_wait_spinner('Syncing content...') { _sync }
+      end
+    end
 
+    private
+
+    def _sync
       api_client = api_site_client(connection_information)
       site = api_client.current_site.get
 
       each_resource do |klass|
         klass.sync(api_client, site, path)
       end
-    end
 
-    private
+      print_result_message
+    end
 
     def each_resource
       RESOURCES.each do |name|
@@ -52,6 +62,11 @@ module Locomotive::Wagon
       read_deploy_settings(self.env, self.path)
     end
 
+    def print_result_message
+      shell.say "\n\nThe content of your local Wagon site has been updated.", :green
+      true
+    end
+
   end
 
 end

data/lib/locomotive/wagon/commands/sync_sub_commands/sync_pages_command.rb

@@ -5,10 +5,18 @@ module Locomotive::Wagon
     include Locomotive::Wagon::BaseConcern
 
     def write_page(page, locale = nil)
-      if attributes = editable_elements_attributes(page, locale)
-        new_content = replace_editable_elements(page_filepath(page, locale), dump(attributes))
+      filepath = page_filepath(page, locale)
 
-        write_to_file(page_filepath(page, locale), new_content)
+      if File.exists?(filepath)
+        # only copy the content of the editable elements
+        if attributes = editable_elements_attributes(page, locale)
+          new_content = replace_editable_elements(filepath, dump(attributes))
+
+          write_to_file(filepath, new_content)
+        end
+      else
+        # pull the whole page
+        super
       end
     end
 
@@ -36,6 +44,22 @@ module Locomotive::Wagon
       end
     end
 
+    def page_filepath(page, locale)
+      fullpath = locale == default_locale ? page.fullpath : "#{fullpaths[page._id]}.#{locale}"
+
+      # HAML template?
+      if File.exists?(filepath = _page_filepath(fullpath, '.haml'))
+        return filepath
+      end
+
+      # simple Liquid template OR the page does not exist in the local site
+      _page_filepath(fullpath)
+    end
+
+    def _page_filepath(fullpath, additional_extension = '')
+      File.join('app', 'views', 'pages', fullpath + ".liquid#{additional_extension}")
+    end
+
   end
 
 end

data/lib/locomotive/wagon/generators/site/{bootstrap3.rb → bootstrap.rb}

@@ -3,19 +3,25 @@ module Locomotive
     module Generators
       module Site
 
-        class Bootstrap3 < Base
+        class Bootstrap < Base
 
           may_use_haml
           may_use_scss
 
           def choose_haml_over_html
             if haml?
+              remove_file File.join(self.destination, 'app/views/pages/layouts/default.liquid')
+              remove_file File.join(self.destination, 'app/views/pages/layouts/simple.liquid')
               remove_file File.join(self.destination, 'app/views/pages/index.liquid')
               remove_file File.join(self.destination, 'app/views/pages/404.liquid')
+              remove_file File.join(self.destination, 'app/views/snippets/nav.liquid')
               remove_file File.join(self.destination, 'app/views/snippets/footer.liquid')
             else
+              remove_file File.join(self.destination, 'app/views/pages/layouts/default.liquid.haml')
+              remove_file File.join(self.destination, 'app/views/pages/layouts/simple.liquid.haml')
               remove_file File.join(self.destination, 'app/views/pages/index.liquid.haml')
               remove_file File.join(self.destination, 'app/views/pages/404.liquid.haml')
+              remove_file File.join(self.destination, 'app/views/snippets/nav.liquid.haml')
               remove_file File.join(self.destination, 'app/views/snippets/footer.liquid.haml')
             end
           end
@@ -26,8 +32,8 @@ module Locomotive
               remove_file File.join(self.destination, 'public/stylesheets/bootstrap.css')
             else
               remove_dir File.join(self.destination, 'public/stylesheets/bootstrap')
-              remove_file File.join(self.destination, 'public/stylesheets/application.css.scss')
-              remove_file File.join(self.destination, 'public/stylesheets/bootstrap.css.scss')
+              remove_file File.join(self.destination, 'public/stylesheets/application.scss')
+              remove_file File.join(self.destination, 'public/stylesheets/bootstrap.scss')
             end
           end
 
@@ -37,10 +43,10 @@ module Locomotive
 
         end
 
-        Locomotive::Wagon::Generators::Site.register(:bootstrap3, Bootstrap3, %{
-          A site powered by Twitter bootstrap (v3.1.1).
+        Locomotive::Wagon::Generators::Site.register(:bootstrap, Bootstrap, %{
+          A site powered by Bootstrap (v3.3.5).
         })
       end
     end
   end
-end
+end

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

@@ -139,7 +139,7 @@ end
 require 'locomotive/wagon/generators/site/base'
 require 'locomotive/wagon/generators/site/blank'
 require 'locomotive/wagon/generators/site/line_case'
-require 'locomotive/wagon/generators/site/bootstrap3'
+require 'locomotive/wagon/generators/site/bootstrap'
 require 'locomotive/wagon/generators/site/foundation5'
 require 'locomotive/wagon/generators/site/unzip'
 require 'locomotive/wagon/generators/site/cloned'

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

@@ -49,7 +49,7 @@ module Locomotive::Wagon
 
     def clear_cache_for(resource, files)
       keys = case resource
-      when :sites then '_sites'
+      when :site  then '_sites'
       when :content_entries
         files.map { |f| "site_1_content_type_#{File.basename(f, '.yml')}_content_entries" }
       else

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.0.0.rc2'
+    VERSION = '2.0.0.rc3'
   end
 end

data/lib/locomotive/wagon.rb

@@ -92,9 +92,9 @@ module Locomotive
     # @param [ Hash ] connection_info The information to get connected to the remote site
     # @param [ Hash ] options The options passed to the pull process
     #
-    def self.sync(env, path, options = {})
+    def self.sync(env, path, options = {}, shell)
       require_relative 'wagon/commands/sync_command'
-      Locomotive::Wagon::SyncCommand.sync(env, path, options)
+      Locomotive::Wagon::SyncCommand.sync(env, path, options, shell)
     end
 
     # Clone a site from a remote LocomotiveCMS engine.

data/locomotivecms_wagon.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine}
   gem.summary       = %q{The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine powered by all the efficient and modern HTML development tools (Haml, SASS, Compass, Less).}
   gem.homepage      = 'http://www.locomotivecms.com'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -26,9 +27,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'netrc',                 '~> 0.10.3'
 
   gem.add_dependency 'locomotivecms_coal',    '~> 1.0.0.rc1'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0.rc2'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0.rc3'
 
-  gem.add_dependency 'listen',                '~> 2.10.0'
+  gem.add_dependency 'listen',                '~> 3.0.4'
   gem.add_dependency 'rack-livereload',       '~> 0.3.15'
   gem.add_dependency 'yui-compressor',        '~> 0.12.0'
 

data/spec/unit/decorators/theme_asset_decorator_spec.rb

@@ -55,6 +55,16 @@ describe Locomotive::Wagon::ThemeAssetDecorator do
         it { is_expected.to eq 'application.css' }
       end
 
+      describe 'jquery.pluginXy.css' do
+        let(:filepath) { '/somewhere/mysite/public/stylesheets/jquery.pluginXy.css' }
+        it { is_expected.to eq 'jquery.pluginXy.css' }
+      end
+
+      describe 'jquery.pluginXy.css.scss' do
+        let(:filepath) { '/somewhere/mysite/public/stylesheets/jquery.pluginXy.css' }
+        it { is_expected.to eq 'jquery.pluginXy.css' }
+      end
+
     end
 
     describe 'js' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: rack-livereload
   requirement: !ruby/object:Gem::Requirement
@@ -199,87 +199,120 @@ files:
 - generators/blank/public/javascripts/.empty_directory
 - generators/blank/public/samples/.empty_directory
 - generators/blank/public/stylesheets/.empty_directory
+- generators/bootstrap/Gemfile.tt
+- generators/bootstrap/app/content_types/.empty_directory
+- generators/bootstrap/app/views/pages/404.liquid
+- generators/bootstrap/app/views/pages/404.liquid.haml
+- generators/bootstrap/app/views/pages/index.liquid
+- generators/bootstrap/app/views/pages/index.liquid.haml
+- generators/bootstrap/app/views/pages/layouts/default.liquid
+- generators/bootstrap/app/views/pages/layouts/default.liquid.haml
+- generators/bootstrap/app/views/pages/layouts/simple.liquid
+- generators/bootstrap/app/views/pages/layouts/simple.liquid.haml
+- generators/bootstrap/app/views/snippets/footer.liquid
+- generators/bootstrap/app/views/snippets/footer.liquid.haml
+- generators/bootstrap/app/views/snippets/nav.liquid
+- generators/bootstrap/app/views/snippets/nav.liquid.haml
+- generators/bootstrap/config/deploy.yml
 - generators/bootstrap/config/site.yml.tt
-- generators/bootstrap3/Gemfile.tt
-- generators/bootstrap3/app/content_types/.empty_directory
-- generators/bootstrap3/app/views/pages/404.liquid
-- generators/bootstrap3/app/views/pages/404.liquid.haml
-- generators/bootstrap3/app/views/pages/index.liquid
-- generators/bootstrap3/app/views/pages/index.liquid.haml
-- generators/bootstrap3/app/views/snippets/footer.liquid
-- generators/bootstrap3/app/views/snippets/footer.liquid.haml
-- generators/bootstrap3/config/deploy.yml
-- generators/bootstrap3/config/site.yml.tt
-- generators/bootstrap3/config/translations.yml
-- generators/bootstrap3/data/.empty_directory
-- generators/bootstrap3/icon.png
-- generators/bootstrap3/public/fonts/glyphicons-halflings-regular.eot
-- generators/bootstrap3/public/fonts/glyphicons-halflings-regular.svg
-- generators/bootstrap3/public/fonts/glyphicons-halflings-regular.ttf
-- generators/bootstrap3/public/fonts/glyphicons-halflings-regular.woff
-- generators/bootstrap3/public/images/.empty_directory
-- generators/bootstrap3/public/javascripts/bootstrap.min.js
-- generators/bootstrap3/public/javascripts/bootstrap/affix.js
-- generators/bootstrap3/public/javascripts/bootstrap/alert.js
-- generators/bootstrap3/public/javascripts/bootstrap/button.js
-- generators/bootstrap3/public/javascripts/bootstrap/carousel.js
-- generators/bootstrap3/public/javascripts/bootstrap/collapse.js
-- generators/bootstrap3/public/javascripts/bootstrap/dropdown.js
-- generators/bootstrap3/public/javascripts/bootstrap/modal.js
-- generators/bootstrap3/public/javascripts/bootstrap/popover.js
-- generators/bootstrap3/public/javascripts/bootstrap/scrollspy.js
-- generators/bootstrap3/public/javascripts/bootstrap/tab.js
-- generators/bootstrap3/public/javascripts/bootstrap/tooltip.js
-- generators/bootstrap3/public/javascripts/bootstrap/transition.js
-- generators/bootstrap3/public/samples/apple-touch-icon-114x114-precomposed.png
-- generators/bootstrap3/public/samples/apple-touch-icon-144x144-precomposed.png
-- generators/bootstrap3/public/samples/apple-touch-icon-72x72-precomposed.png
-- generators/bootstrap3/public/samples/apple-touch-icon-precomposed.png
-- generators/bootstrap3/public/samples/favicon.png
-- generators/bootstrap3/public/stylesheets/application.css
-- generators/bootstrap3/public/stylesheets/application.css.scss
-- generators/bootstrap3/public/stylesheets/bootstrap.css
-- generators/bootstrap3/public/stylesheets/bootstrap.css.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_alerts.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_badges.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_breadcrumbs.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_button-groups.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_buttons.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_carousel.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_close.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_code.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_component-animations.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_dropdowns.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_forms.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_glyphicons.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_grid.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_input-groups.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_jumbotron.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_labels.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_list-group.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_media.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_mixins.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_modals.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_navbar.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_navs.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_normalize.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_pager.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_pagination.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_panels.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_popovers.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_print.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_progress-bars.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_responsive-utilities.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_scaffolding.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_tables.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_theme.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_thumbnails.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_tooltip.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_type.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_utilities.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_variables.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/_wells.scss
-- generators/bootstrap3/public/stylesheets/bootstrap/bootstrap.css.scss
+- generators/bootstrap/config/translations.yml
+- generators/bootstrap/data/.empty_directory
+- generators/bootstrap/icon.png
+- generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.eot
+- generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.svg
+- generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.ttf
+- generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.woff
+- generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.woff2
+- generators/bootstrap/public/images/favicon.png
+- generators/bootstrap/public/javascripts/application.js
+- generators/bootstrap/public/javascripts/bootstrap.min.js
+- generators/bootstrap/public/javascripts/bootstrap/affix.js
+- generators/bootstrap/public/javascripts/bootstrap/alert.js
+- generators/bootstrap/public/javascripts/bootstrap/button.js
+- generators/bootstrap/public/javascripts/bootstrap/carousel.js
+- generators/bootstrap/public/javascripts/bootstrap/collapse.js
+- generators/bootstrap/public/javascripts/bootstrap/dropdown.js
+- generators/bootstrap/public/javascripts/bootstrap/modal.js
+- generators/bootstrap/public/javascripts/bootstrap/popover.js
+- generators/bootstrap/public/javascripts/bootstrap/scrollspy.js
+- generators/bootstrap/public/javascripts/bootstrap/tab.js
+- generators/bootstrap/public/javascripts/bootstrap/tooltip.js
+- generators/bootstrap/public/javascripts/bootstrap/transition.js
+- generators/bootstrap/public/javascripts/jquery.min.js
+- generators/bootstrap/public/stylesheets/application.css
+- generators/bootstrap/public/stylesheets/application.scss
+- generators/bootstrap/public/stylesheets/bootstrap.css
+- generators/bootstrap/public/stylesheets/bootstrap.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_alerts.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_badges.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_breadcrumbs.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_button-groups.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_buttons.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_carousel.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_close.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_code.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_component-animations.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_dropdowns.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_forms.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_glyphicons.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_grid.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_input-groups.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_jumbotron.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_labels.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_list-group.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_media.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_mixins.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_modals.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_navbar.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_navs.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_normalize.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_pager.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_pagination.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_panels.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_popovers.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_print.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_progress-bars.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_responsive-embed.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_responsive-utilities.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_scaffolding.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_tables.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_theme.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_thumbnails.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_tooltip.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_type.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_utilities.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_variables.scss
+- generators/bootstrap/public/stylesheets/bootstrap/_wells.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_alerts.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_background-variant.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_border-radius.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_buttons.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_center-block.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_clearfix.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_forms.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_gradients.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_grid-framework.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_grid.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_hide-text.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_image.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_labels.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_list-group.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_nav-divider.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_nav-vertical-align.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_opacity.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_pagination.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_panels.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_progress-bar.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_reset-filter.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_reset-text.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_resize.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_responsive-visibility.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_size.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_tab-focus.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_table-row.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-emphasis.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-overflow.scss
+- generators/bootstrap/public/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
 - generators/cloned/Gemfile.tt
 - generators/cloned/app/content_types/.empty_directory
 - generators/cloned/app/views/pages/.empty_directory
@@ -489,6 +522,7 @@ files:
 - lib/locomotive/wagon/commands/concerns/deploy_file_concern.rb
 - lib/locomotive/wagon/commands/concerns/instrumentation_concern.rb
 - lib/locomotive/wagon/commands/concerns/netrc_concern.rb
+- lib/locomotive/wagon/commands/concerns/spinner_concern.rb
 - lib/locomotive/wagon/commands/concerns/steam_concern.rb
 - lib/locomotive/wagon/commands/destroy_command.rb
 - lib/locomotive/wagon/commands/generate_command.rb
@@ -543,8 +577,7 @@ files:
 - lib/locomotive/wagon/generators/site.rb
 - lib/locomotive/wagon/generators/site/base.rb
 - lib/locomotive/wagon/generators/site/blank.rb
-- lib/locomotive/wagon/generators/site/bootstrap2.rb
-- lib/locomotive/wagon/generators/site/bootstrap3.rb
+- lib/locomotive/wagon/generators/site/bootstrap.rb
 - lib/locomotive/wagon/generators/site/cloned.rb
 - lib/locomotive/wagon/generators/site/foundation4.rb
 - lib/locomotive/wagon/generators/site/foundation5.rb
@@ -660,7 +693,8 @@ files:
 - spec/unit/decorators/site_decorator_spec.rb
 - spec/unit/decorators/theme_asset_decorator_spec.rb
 homepage: http://www.locomotivecms.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -678,7 +712,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine