middleman-presentation-core 0.16.0.beta → 0.16.0.rc1

data/lib/middleman-presentation-core/cli/build_presentation.rb

@@ -8,6 +8,8 @@ module Middleman
 
         desc Middleman::Presentation.t('views.presentation.build.title')
 
+        class_option :add_static_servers, type: :boolean, default: Middleman::Presentation.config.add_static_servers, desc: Middleman::Presentation.t('views.presentation.build.options.add_static_servers')
+
         def initialize_generator
           enable_debug_mode
         end
@@ -31,6 +33,16 @@ module Middleman
           @javascripts_directory = @environment.scripts_directory
           @fonts_directory       = @environment.fonts_directory
           @rackup_config_file    = File.join @environment.build_directory, 'config.ru'
+          @readme_file           = File.join @environment.build_directory, 'README.md'
+
+          @title                 = Middleman::Presentation.config.title
+          @subtitle              = Middleman::Presentation.config.subtitle
+          @author                = Middleman::Presentation.config.author
+          @speaker               = Middleman::Presentation.config.speaker
+          @date                  = Middleman::Presentation.config.date
+          @license_file          = Dir.glob(File.join(@environment.root_path, 'LICENSE.*')).first
+
+          @add_static_servers = options[:add_static_servers]
         end
 
         def build_presentation
@@ -51,6 +63,24 @@ module Middleman
         def add_rackup_file
           template 'rackup.config.erb', @rackup_config_file
         end
+
+        def add_server_executables
+          return unless @add_static_servers
+
+          pattern = File.expand_path('../../../../utils/server/*', __FILE__)
+          Dir.glob(pattern).each { |f| FileUtils.cp f, @environment.build_path }
+        end
+
+        def add_readme
+          template_file = BuildReadmeTemplate.new
+          template template_file.file, File.join(@environment.build_directory, "README#{template_file.proposed_extname}"), force: options[:force]
+        end
+
+        def add_license
+          return if @license_file.blank?
+
+          copy_file @license_file, File.join(@environment.build_directory, File.basename(@license_file))
+        end
       end
     end
   end

data/lib/middleman-presentation-core/cli/create_presentation.rb

@@ -6,6 +6,10 @@ module Middleman
       class CreatePresentation < BaseGroup
         include Thor::Actions
 
+        def self.exit_on_failure?
+          true
+        end
+
         class_option :speaker, required: true, default: Middleman::Presentation.config.speaker, desc: Middleman::Presentation.t('views.presentations.create.options.speaker')
         class_option :title, required: true, desc: Middleman::Presentation.t('views.presentations.create.options.title')
         class_option :date, required: true, default: Time.now.strftime('%d.%m.%Y'), desc: Middleman::Presentation.t('views.presentations.create.options.date')
@@ -70,6 +74,8 @@ module Middleman
         class_option :stylesheets_directory, default: Middleman::Presentation.config.stylesheets_directory, desc: Middleman::Presentation.t('views.presentations.create.options.stylesheets_directory')
         class_option :fonts_directory, default: Middleman::Presentation.config.fonts_directory, desc: Middleman::Presentation.t('views.presentations.create.options.fonts_directory')
         class_option :build_directory, default: Middleman::Presentation.config.build_directory, desc: Middleman::Presentation.t('views.presentations.create.options.build_directory')
+        class_option :network_port, default: Middleman::Presentation.config.network_port, desc: Middleman::Presentation.t('views.presentations.create.options.network_port')
+        class_option :network_interface, default: Middleman::Presentation.config.network_interface, desc: Middleman::Presentation.t('views.presentations.create.options.network_interface')
 
         argument :directory, default: Dir.getwd, desc: Middleman::Presentation.t('views.presentations.create.arguments.directory')
 
@@ -154,6 +160,9 @@ module Middleman
           Middleman::Presentation.config.stylesheets_directory = options[:stylesheets_directory]
           Middleman::Presentation.config.fonts_directory = options[:fonts_directory]
           Middleman::Presentation.config.build_directory = options[:build_directory]
+
+          Middleman::Presentation.config.network_port = options[:network_port]
+          Middleman::Presentation.config.network_interface = options[:network_interface]
         end
 
         def create_root_directory
@@ -174,10 +183,11 @@ module Middleman
 
         def create_gemfile
           @rubygem_path = File.expand_path('../../../../../', __FILE__)
+          @library_version = Middleman::Presentation::VERSION
           template 'Gemfile.tt', File.join(middleman_environment.root_path, 'Gemfile'), force: options[:force]
         end
 
-        def create_config_file
+        def create_presentation_config_file
           create_file(
             File.join(middleman_environment.root_path, '.middleman-presentation.yaml'),
             Middleman::Presentation.config.to_yaml(keys: Middleman::Presentation.config.exportable_options, remove_blank: true),
@@ -185,6 +195,14 @@ module Middleman
           )
         end
 
+        def create_local_config_file
+          create_file(
+            File.join(middleman_environment.root_path, '.middleman-presentation.local.yaml'),
+            Middleman::Presentation.config.to_yaml(keys: Middleman::Presentation.config.local_options, remove_blank: true),
+            force: options[:force]
+          )
+        end
+
         def create_bower_configuration_files
           assets_loader.load_for_bower_update
 
@@ -218,22 +236,26 @@ module Middleman
           return unless options[:create_predefined_slides]
 
           PredefinedSlideTemplateDirectory.new(working_directory: middleman_environment.root_path).template_files.each do |file|
-            template file,
-                     File.join(
-                       middleman_environment.sources_path,
-                       Middleman::Presentation.config.slides_directory,
-                       File.basename(file, '.tt')
-                   ),
-                     force: options[:force]
+            template(
+              file,
+              File.join(
+                middleman_environment.sources_path,
+                Middleman::Presentation.config.slides_directory,
+                File.basename(file, '.tt')
+              ),
+              force: options[:force]
+            )
           end
         end
 
         def create_default_license_file_to_presentation
-          copy_file 'LICENSE.presentation', File.join(middleman_environment.root_path, 'LICENSE.presentation'), force: options[:force]
+          license_template = PresentationLicenseTemplate.new
+
+          template license_template.file, File.join(middleman_environment.root_path, "LICENSE#{license_template.proposed_extname}"), force: options[:force]
         end
 
         def create_helper_scripts
-          %w(start bootstrap slide presentation build export).each do |s|
+          %w(start bootstrap build export).each do |s|
             copy_file File.join('script', s), File.join(middleman_environment.root_path, 'script', s), force: options[:force]
             chmod File.join(middleman_environment.root_path, 'script', s), 0755, force: options[:force]
           end
@@ -243,16 +265,18 @@ module Middleman
           inside directory do
             fail Thor::Error, Middleman::Presentation.t('errors.bower_command_not_found', path: ENV['PATH']) if options[:check_for_bower] && File.which('bower').blank?
 
-            result = run('bower update', capture: true) if options[:install_assets] == true
-            fail Thor::Error, Middleman::Presentation.t('errors.bower_command_failed', result: result) unless $CHILD_STATUS.exitstatus == 0
+            system('bower update') || \
+              fail(Thor::Error, Middleman::Presentation.t('errors.bower_command_failed', result: '')) \
+              if options[:install_assets] == true
           end
         end
 
         def install_gems
           inside directory do
             Bundler.with_clean_env do
-              result = run('bundle install', capture: true) if options[:install_assets] == true
-              fail Thor::Error, Middleman::Presentation.t('errors.bundle_command_failed', result: result) unless $CHILD_STATUS.exitstatus == 0
+              system('bundle install') || \
+                fail(Thor::Error, Middleman::Presentation.t('errors.bundle_command_failed', result: '')) \
+                if options[:install_assets] == true
             end
           end
         end

data/lib/middleman-presentation-core/cli/export.rb

@@ -5,6 +5,8 @@ module Middleman
       # Run command
       class Export < Base
         register ExportPresentation, 'presentation', 'presentation', 'Export presentation'
+
+        default_command :presentation
       end
     end
   end

data/lib/middleman-presentation-core/cli/init.rb

@@ -6,6 +6,8 @@ module Middleman
       class Init < Base
         register(InitApplication, 'application', 'application', Middleman::Presentation.t('views.applications.init.title'))
         register(InitPredefinedSlides, 'predefined_slides', 'predefined_slides', Middleman::Presentation.t('views.predefined_slides.init.title'))
+
+        default_command :application
       end
     end
   end

data/lib/middleman-presentation-core/cli/init_application.rb

@@ -39,7 +39,11 @@ module Middleman
               force: options[:force]
             )
           else
-            template 'config.yaml.tt', file, force: options[:force]
+            create_file(
+              file,
+              Middleman::Presentation.config.to_yaml(keys: Middleman::Presentation.config.known_options, remove_blank: false, prepend: '# '),
+              force: options[:force]
+            )
           end
         end
       end

data/lib/middleman-presentation-core/cli/runner.rb

@@ -4,6 +4,10 @@ module Middleman
     module Cli
       # Run command
       class Runner < Base
+        def self.exit_on_failure?
+          true
+        end
+
         class_option :debug_mode, default: Middleman::Presentation.config.debug_mode, type: :boolean, desc: Middleman::Presentation.t('views.application.options.debug_mode')
         class_option :bower_directory, default: Middleman::Presentation.config.bower_directory, desc: Middleman::Presentation.t('views.application.options.bower_directory')
 

data/lib/middleman-presentation-core/cli/serve_presentation.rb

@@ -8,6 +8,7 @@ module Middleman
 
         class_option :network_port, type: :numeric, default: Middleman::Presentation.config.network_port, desc: Middleman::Presentation.t('views.presentation.serve.options.network_port')
         class_option :network_interface, default: Middleman::Presentation.config.network_interface, desc: Middleman::Presentation.t('views.presentation.serve.options.network_interface')
+        class_option :open_in_browser, type: :boolean, default: Middleman::Presentation.config.open_in_browser, desc: Middleman::Presentation.t('views.presentation.serve.options.open_in_browser')
 
         def initialize_generator
           enable_debug_mode
@@ -19,6 +20,8 @@ module Middleman
             title: Middleman::Presentation.config.title
           )
 
+          Launchy.open(Addressable::URI.parse("http://#{options[:network_interface]}:#{options[:network_port]}")) if options[:open_in_browser]
+
           cmd = []
           cmd << 'middleman server'
           cmd << "-p #{options[:network_port]}"

data/lib/middleman-presentation-core/cli/shared.rb

@@ -41,9 +41,6 @@ module Middleman
 
         # The class methods
         module ClassMethods
-          def self.exit_on_failure?
-            true
-          end
         end
       end
     end

data/lib/middleman-presentation-core/frontend_component.rb

@@ -32,8 +32,6 @@ module Middleman
                                   @to_s = value
                                 end
                               end.new(version)
-                            else
-                              nil
                             end
         fail ArgumentError, Middleman::Presentation.t('errors.undefined_arguments', arguments: %w(resource_locator github version).to_list) if @resource_locator.blank?
 

data/lib/middleman-presentation-core/middleman_environment.rb

@@ -27,7 +27,7 @@ module Middleman
       end
 
       def build_path
-        File.join(sources_path, application_config.build_directory)
+        File.join(root_path, application_config.build_directory)
       end
 
       def stylesheets_directory

data/lib/middleman-presentation-core/presentation_license_template.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+module Middleman
+  module Presentation
+    # Markdown template to create new slides
+    class PresentationLicenseTemplate < FeduxOrgStdlib::FileTemplate
+      def application_name
+        'middleman-presentation'
+      end
+
+      def fallback_template_directory
+        File.expand_path('../../../templates/', __FILE__)
+      end
+    end
+  end
+end

data/lib/middleman-presentation-core/step_definitions.rb

@@ -63,8 +63,17 @@ end
 
 Given(/only the executables of gems "([^"]+)" can be found in PATH/) do |gems|
   dirs = []
+  gem_names = gems.split(/,\s?/).map(&:strip)
 
-  dirs.concat gems.split(/,\s?/).map(&:strip).each_with_object([]) { |e, a| a << Gem::Specification.find_by_name(e).bin_dir }
+  dirs.concat(
+    gem_names.each_with_object([]) do |e, a|
+      gem = Gem::Specification.each.find { |s| s.name == e }
+
+      fail if gem.blank?
+
+      a << gem.bin_dir
+    end
+  )
 
   if ci?
     dirs << "/home/travis/.rvm/rubies/ruby-#{RUBY_VERSION}/bin"
@@ -102,6 +111,10 @@ Given(/^a user template named "(.*?)" with:$/) do |name, string|
   step %(a file named "~/.config/middleman-presentation/templates/#{name}" with:), string
 end
 
+Given(/^a user defined predefined slide named "(.*?)" with:$/) do |name, string|
+  step %(a file named "~/.config/middleman-presentation/predefined_slides.d/#{name}" with:), string
+end
+
 Given(/^a presentation theme named "(.*?)" does not exist$/) do |name|
   step %(I remove the directory "middleman-presentation-theme-#{name}")
 end

data/lib/middleman-presentation-core/utils.rb

@@ -24,7 +24,6 @@ module Middleman
 
         Zip::File.open(destination_file, Zip::File::CREATE) do |file|
           Dir.glob(File.join(source_directory, '**', '*')).each do |filename|
-
             path = ''
             path << prefix if prefix
             path << Pathname.new(filename).relative_path_from(Pathname.new(source_directory)).to_s

data/lib/middleman-presentation-core/version.rb

@@ -3,6 +3,6 @@
 module Middleman
   # Presentation
   module Presentation
-    VERSION = '0.16.0.beta'
+    VERSION = '0.16.0.rc1'
   end
 end

data/locales/de.yml

@@ -62,6 +62,8 @@ de:
       create:
         title: 'Erzeuge eine neue Präsentation in Verzeichnis DIR (standard: aktuelles Arbeitsverzeichnis)'
         options:
+          network_port: Netzwerk-Port, an dem der Server lauschen soll
+          network_interface: Netwerk-Schnittstelle, an der der Server lauschen soll
           runtime_environment: Laufzeit-Umgebung in der middleman-presentation läuft, z.B. "test"
           activate_center: 'Aktiviere "center" in reveal.js'
           activate_controls: 'Aktiviere "controls" in reveal.js'
@@ -215,11 +217,13 @@ de:
         options:
           network_port: Netzwerk-Port, an dem der Server lauschen soll
           network_interface: Netwerk-Schnittstelle, an der der Server lauschen soll
+          open_in_browser: Öffne Präsentation im Browser
       build:
         title: Präsentation generieren
         headline: Generiere die Präsentation "%{title}"
         options:
           title: 'Titel der Präsentation'
+          add_static_servers: 'Ergänze statische Webserver zu der generierten Präsentation'
       export:
         title: Präsentation exportieren
         headline: Exportiere die Präsentation "%{title}" nach "%{file}"

data/locales/en.yml

@@ -62,6 +62,8 @@ en:
       create:
         title: 'Initialize a new presentation in DIR (default: $PWD)'
         options:
+          network_port: Networkport the server listens on
+          network_interface: Networkinterface the server listens on
           runtime_environment: Runtime environment in which middleman-presentation is running, e.g. "test"
           activate_center: 'Activate center in reveal.js'
           activate_controls: 'Activate controls in reveal.js'
@@ -215,11 +217,13 @@ en:
         options:
           network_port: Networkport the server listens on
           network_interface: Networkinterface the server listens on
+          open_in_browser: Open presentation in browser
       build:
         title: Build presentation
         headline: Build presentation "%{title}"
         options:
           title: 'Title of presentation'
+          add_static_servers: 'Add static webservers to built presentation'
       export:
         title: Export presentation
         headline: Export presentation "%{title}" to file "%{file}"

data/middleman-presentation-core.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary               = 'Presentation engine for Middleman'
 
   spec.license               = 'MIT'
-  spec.files                 = `git ls-files -z`.split("\x0")
+  spec.files                 = `git ls-files -z`.split("\x0") + Dir.glob('utils/server/*')
   spec.executables           = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files            = spec.files.grep(%r{^(test|spec|features)/})
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tzinfo', '>= 0.3.0'
   spec.add_dependency 'addressable', '~> 2.3.5'
   spec.add_dependency 'launchy', '~> 2.4.2'
-  spec.add_dependency 'fedux_org-stdlib', '>= 0.10.1'
+  spec.add_dependency 'fedux_org-stdlib', '>= 0.11.1'
   spec.add_dependency 'rake'
   spec.add_dependency 'rubyzip', '~> 1.1.6'
   spec.add_dependency 'liquid'

data/spec/components_manager_spec.rb

@@ -138,5 +138,4 @@ RSpec.describe ComponentsManager do
       # rubocop:enable Style/TrailingWhitespace
     end
   end
-
 end

data/spec/existing_slide_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 
 RSpec.describe ExistingSlide do
-
   context '#file_name' do
     it 'extracts file name' do
       slide1 = ExistingSlide.new(absolute_path('source', 'slides', '01.html.md'))

data/spec/new_slide_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 
 RSpec.describe NewSlide do
-
   context '#<=>' do
     it 'compares slides with same file name' do
       slide1 = NewSlide.new('01.md', base_path: absolute_path('source', 'slides'))

data/spec/presentation_helper_spec.rb

@@ -132,6 +132,5 @@ RSpec.describe PresentationHelper do
 
       expect(helper.available_methods).to eq [:helper1]
     end
-
   end
 end

data/spec/slide_list_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 
 RSpec.describe SlideList do
-
   context '#initialize' do
     it 'requires a list of patterns' do
       slide = double('Middleman::Presentation::NewSlide')

data/templates/Gemfile.tt

@@ -6,12 +6,12 @@ source 'https://rubygems.org'
 <% if Middleman::Presentation.config.runtime_environment == :test -%>
 # Make sure the paths are correct, otherwise you get
 # Bundler-errors a la `Path does not exist`
-gem 'middleman-presentation', path: '<%= File.join(@rubygem_path, 'middleman-presentation') %>'
+gem 'middleman-presentation', '~> <%= @library_version %>', path: '<%= File.join(@rubygem_path, 'middleman-presentation') %>'
 gem 'middleman-presentation-core', path: '<%= File.join(@rubygem_path, 'middleman-presentation-core') %>'
 gem 'middleman-presentation-helpers', path: '<%= File.join(@rubygem_path, 'middleman-presentation-helpers') %>'
 gem 'middleman-presentation-simple_plugin', path: '<%= File.join(@rubygem_path, 'middleman-presentation-core/fixtures/middleman-presentation-simple_plugin') %>'
 <% else -%>
-gem 'middleman-presentation'
+gem 'middleman-presentation', '~> <%= @library_version %>'
 <% end -%>
 
 # Choose one to make `execjs` happy