middleman-presentation-core 0.16.0.rc2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a3718f05a00778bb5d3ebe177e1dcda20866dd
-  data.tar.gz: 1f762a184912a42c9a6165b88c186261b060fd28
+  metadata.gz: b20816a0dd2d3570e4037b77dec81ac214288a67
+  data.tar.gz: e23d96468db3da230243588e320555a985e22af4
 SHA512:
-  metadata.gz: d18bbfa635167eebc1509b02cca4c28d86442ca139862a8b8fac826e0da6fe518bd4a465a7a62c045b501866a9b07c0fc60ddce832c09fa1b3e906cc7d724530
-  data.tar.gz: b4cbce628a5c964e98f7f02614bcbf2be28f0926acf4d3f337efda5a4eb51057500004019da076be87f9440385b278d1faf7ced418b05a38253004a87d4e6e98
+  metadata.gz: d3f73b4dd9bb650a0c7f2efc5018a2b96eb5a8dd384eab61ca0fa042ea591cfa5e51fff10365279f1053b77427c011d761e4a23be548d1f438b3d6bdc469e13b
+  data.tar.gz: ffc993b8634ab6e56e8d258e4913a8a9acf1e2e85f89f12d8a58e7cfccdae762b8ba9459a6106c9a91a87bb93a39e35147880f980eaf6341f4bed77ae1a5c452

data/Rakefile

@@ -1,104 +1,12 @@
 #!/usr/bin/env rake
 
 require 'filegen'
-require 'fedux_org_stdlib/rake_tasks/project'
 require 'fedux_org_stdlib/rake_tasks/webserver'
 require 'fedux_org_stdlib/rake_tasks/gems'
+require 'fedux_org_stdlib/rake_tasks/software_version/bump'
 require 'active_support/all'
 require 'open3'
 
-def software
-  gemspec.name.sub(/mp-/, 'middleman-presentation-')
-end
-
-def module_name
-  software.sub(/-core/, '').gsub(/-/, '/').camelcase
-end
-
-def require_name
-  software
-end
-
-def gemspec
-  # rubocop:disable Lint/Eval
-  eval File.read(Dir.glob(File.join(File.expand_path('../', __FILE__), '*.gemspec')).first)
-  # rubocop:enable Lint/Eval
-end
-
-def hardware_architecture
-  `uname -m`.chomp
-end
-
-def archlinux_package_name
-  File.join(archlinux_build_directory, "#{software}-#{version}-*-#{hardware_architecture}.pkg.tar.xz")
-end
-
-def version
-  require "#{require_name}/version"
-  "#{module_name}::VERSION".constantize
-end
-
-def root_directory
-  ::File.expand_path('../', __FILE__)
-end
-
-def tar_file
-  ::File.join(pkg_directory, "#{software}-#{version}.tar.gz")
-end
-
-def tmp_directory
-  ::File.join(root_directory, 'tmp', "#{software}-#{version}")
-end
-
-def archlinux_build_directory
-  ::File.join(root_directory, 'share', 'archlinux')
-end
-
-def gem_file
-  ::File.join(root_directory, 'pkg', "#{software}-#{version}.gem")
-end
-
-def pkg_directory
-  ::File.join(root_directory, 'pkg')
-end
-
-def gem_directory
-  ::File.join(root_directory, 'vendor', 'cache')
-end
-
-task default: 'package:gem'
-
-file tmp_directory do
-  FileUtils.mkdir_p tmp_directory
-end
-
-file archlinux_build_directory do
-  FileUtils.mkdir_p archlinux_build_directory
-end
-
-def extract_sha
-  `makepkg -g 2>/dev/null`.split(/\n/).find { |l| l =~ /sha256/ }
-end
-
-namespace :package do
-  desc 'build gem package'
-  task :gem do
-    sh 'RAILS_ENV=production bundle exec rake -f Rakefile.rails assets:clobber'
-    sh 'RAILS_ENV=production bundle exec rake -f Rakefile.rails assets:precompile'
-
-    base_path = File.expand_path('..', __FILE__)
-    FileUtils.chmod_R 'a+r', Dir.glob(File.join(base_path, 'public', 'assets', '**', '*')).keep_if { |f| File.file? f }
-
-    Rake::Task['gem:clean'].invoke
-    Rake::Task['gem:build'].invoke
-  end
-
-  desc 'build arch linux package'
-  task :archlinux do
-    Rake::Task['archlinux:build'].invoke
-  end
-end
-
 require 'coveralls/rake/task'
 Coveralls::RakeTask.new
 
@@ -109,8 +17,13 @@ namespace :test do
   desc 'Test with coveralls'
   task coveralls: ['test', 'coveralls:push']
 
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
+  task :rubocop do
+    sh 'bundle exec rubocop'
+  end
+
+  task 'rubocop:autocorrect' do
+    sh 'bundle exec rubocop --auto-correct'
+  end
 
   desc 'Run rspec'
   task :rspec do
@@ -139,65 +52,4 @@ namespace :gem do
   end
 end
 
-namespace :archlinux do
-  desc 'Install arch linux package'
-  task :install do
-    sh "sudo pacman -U #{archlinux_package_name}"
-  end
-
-  desc 'Prepare package build'
-  task prepare: ['package:gem', archlinux_build_directory] do
-    generator = Filegen::Rubygen.new
-    template = File.read(File.expand_path('../share/archlinux/PKGBUILD.sh.erb', __FILE__))
-    build_file = File.expand_path('../share/archlinux/PKGBUILD', __FILE__)
-
-    if ENV.key?('LOCAL_BUILD')
-      package_file = ::File.join(pkg_directory, "#{software}-#{version}.gem")
-      source       = ''
-    else
-      # package_file = '$pkgname-$pkgver.gem'
-      package_file = '$pkgname'
-      source       = 'http://gems.rubyforge.org/gems/$pkgname-$pkgver.gem'
-    end
-
-    data = {
-      sha: nil,
-      version: version,
-      package: package_file,
-      source: source
-    }
-
-    Dir.chdir(archlinux_build_directory) do
-      File.open(build_file, 'w') do |f|
-        f.write generator.run(template, data)
-      end
-
-      data = {
-        sha: extract_sha,
-        version: version,
-        package: package_file,
-        source: source
-      }
-
-      File.open(build_file, 'w') do |f|
-        f.write generator.run(template, data)
-      end
-    end
-  end
-
-  desc 'Build package'
-  task build: 'archlinux:prepare' do
-    Dir.chdir(archlinux_build_directory) do
-      sh 'makepkg -f'
-    end
-  end
-
-  desc 'Build source package for aur'
-  task build_source: 'archlinux:prepare' do
-    Dir.chdir(archlinux_build_directory) do
-      sh 'makepkg --source'
-    end
-  end
-end
-
 task 'gem:build' => 'webserver:fetch'

data/features/create_presentation-cli.feature

@@ -45,7 +45,7 @@ Feature: Initialize presentation
     """
     @import 'normalize.css/normalize';
     @import 'highlightjs/styles/zenburn';
-    @import 'reveal.js/css/reveal.min';
+    @import 'reveal.js/css/reveal';
     @import 'reveal.js/css/theme/template/mixins';
     @import 'reveal.js/css/theme/template/settings';
     @import 'middleman-presentation-helpers/footer/footer';
@@ -56,7 +56,7 @@ Feature: Initialize presentation
     And the file "source/javascripts/application.js" should contain:
     """
     //= require jquery/dist/jquery
-    //= require reveal.js/js/reveal.min
+    //= require reveal.js/js/reveal
     //= require reveal.js/lib/js/head.min
     //= require middleman-presentation-helpers/footer/footer
     //= require lightbox2/js/lightbox
@@ -69,7 +69,7 @@ Feature: Initialize presentation
     """
     @import 'normalize.css/normalize';
     @import 'highlightjs/styles/zenburn';
-    @import 'reveal.js/css/reveal.min';
+    @import 'reveal.js/css/reveal';
     @import 'reveal.js/css/theme/template/mixins';
     @import 'reveal.js/css/theme/template/settings';
     @import 'middleman-presentation-helpers/footer/footer';
@@ -80,7 +80,7 @@ Feature: Initialize presentation
     And the file "source/javascripts/application.js" should contain:
     """
     //= require jquery/dist/jquery
-    //= require reveal.js/js/reveal.min
+    //= require reveal.js/js/reveal
     //= require reveal.js/lib/js/head.min
     //= require middleman-presentation-helpers/footer/footer
     //= require lightbox2/js/lightbox
@@ -277,7 +277,7 @@ Feature: Initialize presentation
     Then the file "source/javascripts/application.js" should contain:
     """
     //= require jquery/dist/jquery
-    //= require reveal.js/js/reveal.min
+    //= require reveal.js/js/reveal
     //= require reveal.js/lib/js/head.min
     //= require middleman-presentation-helpers/footer/footer
     //= require lightbox2/js/lightbox

data/features/create_slide-cli.feature

@@ -148,16 +148,16 @@ Feature: Add new slide
     When I successfully run `middleman-presentation create slide 01`
     Then the output should contain:
     """
-    create    slides/01.html.md
+    create slides/01.html.md
     """
 
   Scenario: Output information that multiple slides were created
     When I successfully run `middleman-presentation create slide 01 02 03`
     Then the output should contain:
     """
-    create    slides/01.html.md
-    create    slides/02.html.md
-    create    slides/03.html.md
+    create slides/01.html.md
+    create slides/02.html.md
+    create slides/03.html.md
     """
 
   Scenario: Output information that a slide already exists
@@ -165,7 +165,7 @@ Feature: Add new slide
     When I successfully run `middleman-presentation create slide 01`
     Then the output should contain:
     """
-    exist     slides/01.html.md
+    exist  slides/01.html.md
     """
 
   Scenario: Output information that multiple slides already exist
@@ -173,7 +173,7 @@ Feature: Add new slide
     When I successfully run `middleman-presentation create slide 01 02 03`
     Then the output should contain:
     """
-    exist     slides/01.html.md
+    exist  slides/01.html.md
     """
 
   Scenario: Create Group of slides in subfolder

data/lib/middleman-presentation-core.rb

@@ -4,15 +4,18 @@ require 'middleman-core/cli'
 require 'middleman-sprockets'
 
 require 'set'
+require 'erubis'
 require 'bundler'
 require 'English'
 # require 'ptools'
 require 'pathname'
 require 'fileutils'
 require 'uri'
+require 'thor'
 require 'addressable/uri'
 require 'securerandom'
 require 'launchy'
+require 'colorize'
 require 'fedux_org_stdlib/app_config'
 require 'fedux_org_stdlib/logging/logger'
 require 'fedux_org_stdlib/file_template'
@@ -47,6 +50,7 @@ require 'middleman-presentation-core/middleman_environment'
 require 'middleman-presentation-core/overwrite_sass'
 require 'middleman-presentation-core/plugin'
 require 'middleman-presentation-core/version'
+require 'middleman-presentation-core/ruby'
 require 'middleman-presentation-core/syntax_highlighter'
 require 'middleman-presentation-core/list'
 require 'middleman-presentation-core/asset_store'

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

@@ -0,0 +1,8 @@
+# encoding: utf-8
+# Middleman
+module Middleman
+  # Presentation
+  module Presentation
+    REQUIRED_RUBY_VERSION = '>= 2.1.0'
+  end
+end

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

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

data/middleman-presentation-core.gemspec

@@ -3,6 +3,7 @@ lib = File.expand_path('../../middleman-presentation-core/lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'middleman-presentation-core/version'
+require 'middleman-presentation-core/ruby'
 
 Gem::Specification.new do |spec|
   spec.name                  = 'middleman-presentation-core'
@@ -19,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files            = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.require_paths         = ['lib']
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = Middleman::Presentation::REQUIRED_RUBY_VERSION
 
   spec.add_dependency 'middleman', '~> 3.3.5'
   spec.add_dependency 'middleman-sprockets', '~> 3.3.8'
@@ -32,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake'
   spec.add_dependency 'rubyzip', '~> 1.1.6'
   spec.add_dependency 'liquid'
+  spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'erubis'
   spec.add_dependency 'kramdown'
   spec.add_dependency 'nokogiri'
@@ -39,5 +41,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'i18n'
   spec.add_dependency 'hirb'
   spec.add_dependency 'rouge'
+  spec.add_dependency 'colorize'
   #  spec.add_dependency 'ptools', '>= 1.2.6'
 end

data/templates/Gemfile.tt

@@ -22,6 +22,7 @@ gem 'kramdown'
 gem 'github-markup'
 gem 'liquid'
 gem 'rake'
+gem 'middleman-minify-html'
 
 group :debug do
   gem 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-presentation-core
 version: !ruby/object:Gem::Version
-  version: 0.16.0.rc2
+  version: 0.16.0
 platform: ruby
 authors:
 - Max Meyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +277,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - dev@fedux.org
@@ -401,6 +429,7 @@ files:
 - lib/middleman-presentation-core/presentation_license_template.rb
 - lib/middleman-presentation-core/register_extension.rb
 - lib/middleman-presentation-core/roles/comparable_by_name.rb
+- lib/middleman-presentation-core/ruby.rb
 - lib/middleman-presentation-core/slide_group.rb
 - lib/middleman-presentation-core/slide_list.rb
 - lib/middleman-presentation-core/slide_name.rb
@@ -509,9 +538,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5