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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e474a0c63cb81ac21f9207b2372a962b063685a
-  data.tar.gz: d111a0f6c4f8f9d2346b4dc9246b7680d547f7cd
+  metadata.gz: 4bd64892af5acf1b3af13a0c284c7641221ec053
+  data.tar.gz: 14b5e5f102abb8d1eadbf434ca9f71b2a5670229
 SHA512:
-  metadata.gz: 3e973d30e5ce00e6ed584011c45cd4f165c8b0e8db18c165d607dd77fecf3344d93b7d724b5a45e22d3645994da97dbb40115208c9cfd78e2a6505928d6e8d8f
-  data.tar.gz: 9020f78fea662e51a53ed42e13fb2575ed87b974d0ebe8c4b5e0cbc5c4b92efb1e008255448a8ef585189823b8648bf84eb08e86fefce26704b5fba5c7df86e3
+  metadata.gz: e48f3a387b3fad17af8dee9b97c2a5bc97b688e4d34b3fbfec0e07f4151ada4ba1442c5e66e08509b6f69c602185b6e694255f94442b5d477f95120e49665358
+  data.tar.gz: 557e6496f20bda89ad39766726b86e894d6923407eba016e7eb575c7ddfe6604f398490f03510789baacba1f1a127c78d5c68b2339632ac39c7808b41e561aee

data/Rakefile

@@ -1,7 +1,9 @@
 #!/usr/bin/env rake
 
 require 'filegen'
-require 'fedux_org_stdlib/rake_tasks'
+require 'fedux_org_stdlib/rake_tasks/project'
+require 'fedux_org_stdlib/rake_tasks/webserver'
+require 'fedux_org_stdlib/rake_tasks/gems'
 require 'active_support/all'
 require 'open3'
 
@@ -79,7 +81,6 @@ def extract_sha
 end
 
 namespace :package do
-
   desc 'build gem package'
   task :gem do
     sh 'RAILS_ENV=production bundle exec rake -f Rakefile.rails assets:clobber'
@@ -198,3 +199,5 @@ namespace :archlinux do
     end
   end
 end
+
+task 'gem:build' => 'webserver:fetch'

data/features/build_presentation.feature

@@ -11,14 +11,19 @@ Feature: Build presentation
     When I successfully run `middleman-presentation build presentation`
     And I cd to "build"
     Then a file named "config.ru" should exist
-    Then a file named "javascripts/application.js" should exist
-    Then a file named "index.html" should exist
-    Then a file named "stylesheets/application.css" should exist
-    Then a file named "javascripts/application.js" should exist
-    Then a file named "javascripts/reveal.js/plugin/highlight/highlight.js" should exist
-    Then a file named "javascripts/reveal.js/plugin/zoom-js/zoom.js" should exist
-    Then a file named "javascripts/reveal.js/plugin/notes/notes.js" should exist
-    Then a file named "stylesheets/middleman-presentation-helpers/print/pdf.css" should exist
+    And a file named "server.darwin.amd64" should exist
+    And a file named "server.linux.amd64" should exist
+    And a file named "server.windows.amd64.exe" should exist
+    And a file named "javascripts/application.js" should exist
+    And a file named "index.html" should exist
+    And a file named "stylesheets/application.css" should exist
+    And a file named "LICENSE.md" should exist
+    And a file named "README.md" should exist
+    And a file named "javascripts/application.js" should exist
+    And a file named "javascripts/reveal.js/plugin/highlight/highlight.js" should exist
+    And a file named "javascripts/reveal.js/plugin/zoom-js/zoom.js" should exist
+    And a file named "javascripts/reveal.js/plugin/notes/notes.js" should exist
+    And a file named "stylesheets/middleman-presentation-helpers/print/pdf.css" should exist
 
   Scenario: Change loadable default assets
     Given a user config file for middleman-presentation with:
@@ -60,3 +65,39 @@ Feature: Build presentation
     """
     When I successfully run `middleman-presentation build presentation`
     Then the size of "build/stylesheets/test.css" should be much smaller than from  "source/stylesheets/test.scss"
+
+  Scenario: No license file
+    Given a file named "LICENSE.md" does not exist
+    When I successfully run `middleman-presentation build presentation`
+    And I cd to "build"
+    Then a file named "LICENSE.md" should not exist
+    And the output should not contain:
+    """
+    create  build/LICENSE
+    """
+
+  Scenario: Non default license file
+    Given an empty file named "LICENSE.presentation"
+    And a file named "LICENSE.md" does not exist
+    When I successfully run `middleman-presentation build presentation`
+    And I cd to "build"
+    Then a file named "LICENSE.presentation" should exist
+
+  Scenario: Use different readme template
+    Given a user template named "build_readme.md.tt" with:
+    """
+    # My readme
+    """
+    When I successfully run `middleman-presentation build presentation`
+    And I cd to "build"
+    Then the file "README.md" should contain:
+    """
+    # My readme
+    """
+
+  Scenario: Disable executables
+    When I successfully run `middleman-presentation build presentation --add-static-servers=false`
+    And I cd to "build"
+    Then a file named "server.darwin.amd64" should not exist
+    And a file named "server.linux.amd64" should not exist
+    And a file named "server.windows.amd64.exe" should not exist

data/features/create_presentation-cli.feature

@@ -25,6 +25,10 @@ Feature: Initialize presentation
     And a file named "source/stylesheets/application.scss" should exist
     And a file named "source/javascripts/application.js" should exist
     And a file named "script/start" should exist
+    And a file named "script/export" should exist
+    And a file named "script/build" should exist
+    And a file named "script/bootstrap" should exist
+    And a file named "LICENSE.md" should exist
     And a file named "Rakefile" should exist
     And a directory named "source/images" should exist
     And a directory named "vendor/assets/components" should exist
@@ -32,6 +36,10 @@ Feature: Initialize presentation
     """
     project_id:
     """
+    And the file ".middleman-presentation.local.yaml" should contain:
+    """
+    network_port:
+    """
     Then a directory named "vendor/assets/components/middleman-presentation-theme-default" should exist
     And the file "source/stylesheets/application.scss" should contain:
     """
@@ -54,6 +62,7 @@ Feature: Initialize presentation
     //= require lightbox2/js/lightbox
     """
 
+    @announce
   Scenario: Initialize in test directory
     Given I successfully run `middleman-presentation create presentation test/presentation1 --title "My Presentation"`
     When I cd to "test/presentation1"
@@ -177,7 +186,7 @@ Feature: Initialize presentation
     Fragen
     """
 
-  Scenario: Use englisch language in slides based if garbabe in environment variable
+  Scenario: Use english language in slides based if garbabe in environment variable
     Given I set the environment variables to:
       | variable | value |
       | LANG     | asdf  |
@@ -188,7 +197,7 @@ Feature: Initialize presentation
     Questions
     """
 
-  Scenario: Use englisch language in slides if given garbabe on command line
+  Scenario: Use english language in slides if given garbabe on command line
     Given I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"  --language adsfasdfn`
     When I cd to "presentation1"
     And the file "source/slides/999980.html.erb" should contain:
@@ -236,79 +245,6 @@ Feature: Initialize presentation
     Failed
     """
 
-  Scenario: No predefined slides
-    When I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"  --no-create-predefined-slides`
-    Then a file named "source/slides/00.html.erb" should not exist
-    And a file named "source/slides/999980.html.erb" should not exist
-    And a file named "source/slides/999981.html.erb" should not exist
-    And a file named "source/slides/999982.html.erb" should not exist
-
-  Scenario: Custom start slide template
-    Given a user template named "predefined_slides.d/00.html.erb.tt" with:
-    """
-    <section>
-    <h1>Start</h1>
-    </section>
-    """
-    And I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
-    When I cd to "presentation1"
-    Then a slide named "00.html.erb" should exist with:
-    """
-    <section>
-    <h1>Start</h1>
-    </section>
-    """
-
-  Scenario: Custom questions template
-    Given a user template named "predefined_slides.d/999980.html.erb.tt" with:
-    """
-    <section>
-    <h1>Questions? Really</h1>
-    </section>
-    """
-    And I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
-    When I cd to "presentation1"
-    Then a slide named "999980.html.erb" should exist with:
-    """
-    <section>
-    <h1>Questions? Really</h1>
-    </section>
-    """
-
-  Scenario: Custom contact template
-    Given a user template named "predefined_slides.d/999981.html.erb.tt" with:
-    """
-    <section>
-    <h1>Contact</h1>
-    Me and You
-    </section>
-    """
-    And I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
-    When I cd to "presentation1"
-    Then a slide named "999981.html.erb" should exist with:
-    """
-    <section>
-    <h1>Contact</h1>
-    Me and You
-    </section>
-    """
-
-  Scenario: Custom end slide template
-    Given a user template named "predefined_slides.d/999982.html.erb.tt" with:
-    """
-    <section>
-    <h1>See you!</h1>
-    </section>
-    """
-    And I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
-    When I cd to "presentation1"
-    Then a slide named "999982.html.erb" should exist with:
-    """
-    <section>
-    <h1>See you!</h1>
-    </section>
-    """
-
   Scenario: Install external asset
     Given a user config file for middleman-presentation with:
     """
@@ -347,3 +283,27 @@ Feature: Initialize presentation
     //= require middleman-presentation-helpers/footer/footer
     //= require lightbox2/js/lightbox
     """
+
+  Scenario: Use different license file
+    Given a user template named "presentation_license.md.tt" with:
+    """
+    # License ABC
+    """
+    When I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
+    And I cd to "presentation1"
+    Then the file "LICENSE.md" should contain:
+    """
+    # License ABC
+    """
+
+  Scenario: Use different license file with different format
+    Given a user template named "presentation_license.erb.tt" with:
+    """
+    <h1>License ABC</h1>
+    """
+    When I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
+    And I cd to "presentation1"
+    Then the file "LICENSE.erb" should contain:
+    """
+    <h1>License ABC</h1>
+    """

data/features/init_application-cli.feature

@@ -36,7 +36,13 @@ Feature: Initialize middleman-presentation
     """
     And the user config file for middleman-presentation should contain:
     """
-    # theme: {:name=>"middleman-presentation-theme-default", :github=>"maxmeyer/middleman-presentation-theme-default", :importable_files=>[/stylesheets\/middleman-presentation-theme-default.scss$/], :loadable_files=>[/.*\.png$/]}
+    # theme:
+    #   name: middleman-presentation-theme-default
+    #   github: maxmeyer/middleman-presentation-theme-default
+    #   importable_files:
+    #   - !ruby/regexp /stylesheets\/middleman-presentation-theme-default.scss$/
+    #   loadable_files:
+    #   - !ruby/regexp /.*\.png$/
     """
 
   Scenario: Local for presentation

data/features/init_predefined_slides.feature

@@ -6,4 +6,4 @@ Feature: Initialize predefined slides
 
   Scenario: Default directory
     When I successfully run `middleman-presentation init predefined_slides`
-    Then a file named "~/.config/middleman-presentation/templates/predefined_slides.d/00_00.html.erb.tt" should exist
+    Then a file named "~/.config/middleman-presentation/predefined_slides.d/00_00.html.erb.tt" should exist

data/features/predefined_slides.feature

@@ -0,0 +1,79 @@
+Feature: Use predefined slides when creating a new presentation
+
+  As a presentator
+  I want to create a new presentation using predefined slides
+  In order to use it
+
+  Scenario: No predefined slides
+    When I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"  --no-create-predefined-slides`
+    Then a file named "source/slides/00.html.erb" should not exist
+    And a file named "source/slides/999980.html.erb" should not exist
+    And a file named "source/slides/999981.html.erb" should not exist
+    And a file named "source/slides/999982.html.erb" should not exist
+
+  Scenario: Custom start slide template
+    Given a user defined predefined slide named "00.html.erb.tt" with:
+    """
+    <section>
+    <h1>Start</h1>
+    </section>
+    """
+    And I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
+    When I cd to "presentation1"
+    Then a slide named "00.html.erb" should exist with:
+    """
+    <section>
+    <h1>Start</h1>
+    </section>
+    """
+
+  Scenario: Custom questions template
+    Given a user defined predefined slide named "999980.html.erb.tt" with:
+    """
+    <section>
+    <h1>Questions? Really</h1>
+    </section>
+    """
+    And I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
+    When I cd to "presentation1"
+    Then a slide named "999980.html.erb" should exist with:
+    """
+    <section>
+    <h1>Questions? Really</h1>
+    </section>
+    """
+
+  Scenario: Custom contact template
+    Given a user defined predefined slide named "999981.html.erb.tt" with:
+    """
+    <section>
+    <h1>Contact</h1>
+    Me and You
+    </section>
+    """
+    And I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
+    When I cd to "presentation1"
+    Then a slide named "999981.html.erb" should exist with:
+    """
+    <section>
+    <h1>Contact</h1>
+    Me and You
+    </section>
+    """
+
+  Scenario: Custom end slide template
+    Given a user defined predefined slide named "999982.html.erb.tt" with:
+    """
+    <section>
+    <h1>See you!</h1>
+    </section>
+    """
+    And I successfully run `middleman-presentation create presentation presentation1 --title "My Presentation"`
+    When I cd to "presentation1"
+    Then a slide named "999982.html.erb" should exist with:
+    """
+    <section>
+    <h1>See you!</h1>
+    </section>
+    """
+

data/lib/middleman-presentation-core.rb

@@ -12,6 +12,7 @@ require 'fileutils'
 require 'uri'
 require 'addressable/uri'
 require 'securerandom'
+require 'launchy'
 require 'fedux_org_stdlib/app_config'
 require 'fedux_org_stdlib/logging/logger'
 require 'fedux_org_stdlib/file_template'
@@ -80,6 +81,8 @@ require 'middleman-presentation-core/slide_name'
 require 'middleman-presentation-core/slide_list'
 require 'middleman-presentation-core/ignore_file'
 require 'middleman-presentation-core/slide_group'
+require 'middleman-presentation-core/build_readme_template'
+require 'middleman-presentation-core/presentation_license_template'
 require 'middleman-presentation-core/group_template'
 require 'middleman-presentation-core/erb_template'
 require 'middleman-presentation-core/markdown_template'

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

@@ -3,8 +3,9 @@ module Middleman
   module Presentation
     # Configuration for presentation extension
     class ApplicationConfig < FeduxOrgStdlib::AppConfig
-      option :network_port, 4567
+      option :network_port, (1024..65_535).to_a.sample
       option :network_interface, '127.0.0.1'
+      option :open_in_browser, false
 
       option :title, nil
       option :subtitle, nil
@@ -96,6 +97,12 @@ module Middleman
 
       option :force_create_presentation, false
       option :debug_mode, false
+
+      option :local_options, %w(
+        network_port
+        network_interface
+      )
+
       option :exportable_options, %w(
         activate_center
         activate_controls
@@ -166,7 +173,7 @@ module Middleman
       option :fonts_directory, 'fonts'
       option :build_directory, 'build'
 
-      option :minify_assets, false
+      option :minify_assets, true
 
       option :runtime_environment, ENV['MP_ENV'].to_s.to_sym
       option :use_regex, false
@@ -176,6 +183,8 @@ module Middleman
       option :metadata_headline, [:date, :speaker, :company, :version, :license]
       option :metadata_footer, [:copyright, :author, :license]
 
+      option :add_static_servers, true
+
       def preferred_configuration_file
         ::File.expand_path(::File.join('~', '.config', _application_name, _config_file))
       end
@@ -194,6 +203,8 @@ module Middleman
         [
           ::File.expand_path(::File.join(ConfigurationFile.new(raise_error: false).directory.to_s, format('.%s%s', _application_name, _config_file_suffix))),
           ::File.expand_path(::File.join(ConfigurationFile.new(raise_error: false).directory.to_s, format('%s%s', _application_name, _config_file_suffix))),
+          ::File.expand_path(::File.join(ConfigurationFile.new(raise_error: false).directory.to_s, format('.%s.local%s', _application_name, _config_file_suffix))),
+          ::File.expand_path(::File.join(ConfigurationFile.new(raise_error: false).directory.to_s, format('%s.local%s', _application_name, _config_file_suffix))),
           ::File.expand_path(::File.join('~', '.config', _application_name, _config_file)),
           ::File.expand_path(::File.join('~', format('.%s', _application_name), _config_file)),
           ::File.expand_path(::File.join('~', format('.%s%s', _application_name, _config_file_suffix))),

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

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