octopress-ink 1.0.0.rc.29 → 1.0.0.rc.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38e29560f069cec7661d28c370c84cbd7d75dd8
-  data.tar.gz: 5d1da51d9f5553c320dcadae6a5acbb3721ef915
+  metadata.gz: bcc51a1a453784cb3a90c6160d1cf153a78a0176
+  data.tar.gz: b7f07b207482ae30731e390493225a46293b3148
 SHA512:
-  metadata.gz: 528bdf642e98127d79a00d808a0f2ae6c424b2994032e09529e3d6a42a6ccc1abeff6f61096596e6a839b95e800e1fdc26d2f0199c17cb6805f8360b23fc920c
-  data.tar.gz: ecc263199a90a9f479e1d28d66ca1ed4b7c3c22ca9362fa057f5803e0f0ba48b03c3936041b5832fce611cd78981656c2aa1826697c47efcfd4c4f9a08fa317a
+  metadata.gz: b68e8536e6a318709a44d7f3bb6f0da79f7c2290e9a4c69297c5822380d052e3de147a28b76ea6a7e1ef3a8fae7fb5eb9aa2ff7ec7126c116a783fadd8a5b32b
+  data.tar.gz: 2d84b28d13238dabdd81b20b4ebc2af87bba88e49220e52cc96f7d6db379a6c6664ec9e8d031c121fc309193ea48b45ff4263916482017b1598c2c9b6b3a3568

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC30 - 2015-01-22
+
+- Added `set_lang` placeholder so plugins can easily integrate with [octopress-multilingual](https://github.com/octopress/multilingual).
+
 ### 1.0.0 RC29 - 2015-01-14
 
 - Fixed path issues when writing stylesheet tags.

data/README.md

@@ -5,12 +5,6 @@ Use Ink to help you build themes and plugins for Jekyll.
 [![Gem Version](https://badge.fury.io/rb/octopress-ink.png)](http://badge.fury.io/rb/octopress-ink)
 [![Build Status](https://travis-ci.org/octopress/ink.png?branch=master)](https://travis-ci.org/octopress/ink)
 
-### Features
-- Installing Ink plugins is easy.
-- Users won't need to install or manage plugin assets.
-- Jekyll will read your plugin's layouts, javascripts, stylesheets and more directly from your gem.
-- Ink allows users to modify a theme or plugin by adding a modified version to source/_custom directory.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -25,7 +19,14 @@ Or install it yourself as:
 
     $ gem install octopress-ink
 
+## Usage
+
+Usage is different for users and developers, and useful documentation requires more than a giant README. Docs will be posted with the launch of the new Octopress 3.0 site. In the mean time, you can browse the `assets/docs/` directory for a look at the documentation that's coming.
+
 ## Contributing
 
-For right now. Talk to me directly. I'd love help thinking
-through some of this stuff. Pretty soon, build a theme or a plugin and tell me what's broken.
+1. Fork it ( https://github.com/octopress/ink/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/assets/docs/creating-a-plugin.markdown

@@ -107,13 +107,15 @@ require 'lib/version'
 require 'octopress-ink'
 
 Octopress::Ink.add_plugin({
-  name:          "Some Plugin"
-  slug:          "some_plugin",
-  assets_path:   File.expand_path(File.join(File.dirname(__FILE__), "../assets")),
+  name:          "Some Plugin",
+  slug:          "some-plugin",
+  gem:           "some-plugin",
+  path:          File.expand_path(File.join(File.dirname(__FILE__), "..")),
   type:          "some_plugin",
   version:       SomePlugin::Version,
   description:   "",
-  website:       ""
+  website:       "",
+  source_url:    ""
 })
 ```
 

data/lib/octopress-ink.rb

@@ -10,6 +10,7 @@ require 'octopress-include-tag'
 require 'octopress-ink/version'
 require 'octopress-ink/configuration'
 require 'octopress-ink/jekyll/hooks'
+require 'octopress-ink/tags/set_lang'
 
 module Octopress
   module Ink

data/lib/octopress-ink/commands/new.rb

@@ -48,7 +48,7 @@ module Octopress
             add_dependency
             add_plugin
             add_assets
-            add_demo_files
+            add_test_files
           end
         end
 
@@ -88,7 +88,7 @@ module Octopress
 
         def self.fix_spec_files
           @settings[:gemspec].sub! /(#{@settings[:spec_var]}\.files\s+=\s+)(.+)$/ do
-            $1+"`git ls-files -z`.split(\"\\x0\").grep(/^(bin\/|lib\/|assets\/|demo\/|changelog|readme|license)/i)"
+            $1+"`git ls-files -z`.split(\"\\x0\").grep(/^(bin\/|lib\/|assets\/|changelog|readme|license)/i)"
           end.sub!(/\s*#{@settings[:spec_var]}\.test_files.+$/, '') 
         end
 
@@ -135,6 +135,7 @@ _site
           minor_version = VERSION.scan(/\d+\.\d/)[0]
           current_patch_version = VERSION.sub(/\.(alpha|rc).*/i, '')
           d  = "#{@settings[:spec_var]}.add_development_dependency \"octopress\"\n\n"
+          d  = "#{@settings[:spec_var]}.add_development_dependency \"clash\"\n\n"
           d += "#{@settings[:spec_var]}.add_runtime_dependency \"octopress-ink\", \"~> #{minor_version}\"\n"
         end
 
@@ -158,9 +159,7 @@ _site
 
           # Add Jekyll configuration file
           #
-          config = "exclude:\n  - Gemfile*\ngems:\n  - #{@settings[:name]}"
-          path = File.join(@settings[:path], 'assets', 'config.yml')
-          write(path, config)
+          FileUtils.touch File.join(@settings[:path], 'assets', 'config.yml')
         end
 
         # New plugin uses a simple configuration hash
@@ -182,7 +181,7 @@ _site
 name:          "#{@settings[:module_name]}",
 slug:          "#{@settings[:type] == 'theme' ? 'theme' : @settings[:name]}",
 gem:           "#{@settings[:name]}",
-path:          File.expand_path(File.join(File.dirname(__FILE__), "../")),
+path:          File.expand_path(File.join(File.dirname(__FILE__), "..")),
 type:          "#{@settings[:type]}",
 version:       #{@settings[:version]},
 description:   "",                                # What does your theme/plugin do?
@@ -194,33 +193,30 @@ website:       ""                                 # Optional project website
 
         # Creates a blank Jekyll site for testing out a new plugin
         #
-        def self.add_demo_files
-          demo_dir = File.join(@settings[:path], 'demo')
+        def self.add_test_files
+          test_dir = File.join(@settings[:path], 'test')
 
-          dirs = %w{_layouts _posts}.map! do |d|
-            File.join(demo_dir, d)
+          dirs = %w{_layouts _posts _expected}.map do |d|
+            File.join(test_dir, d)
           end
 
           create_empty_dirs dirs
 
-          index = File.join(demo_dir, 'index.html')
+          index = File.join(test_dir, 'index.html')
           action = File.exist?(index) ? "exists".rjust(12).blue.bold : "create".rjust(12).green.bold
-          FileUtils.touch index
-          puts "#{action}  #{index.sub("#{Dir.pwd}/", '')}"
-
-          gemfile_path = File.join(demo_dir, 'Gemfile')
-          gemfile_content = <<-HERE
-source 'https://rubygems.org'
 
-gemspec path: '../'
-          HERE
+          FileUtils.touch File.join(test_dir, '_expected', 'index.html')
+          FileUtils.touch File.join(test_dir, 'index.html')
 
-          write(gemfile_path, gemfile_content)
+          config_path = File.join(test_dir, '_config.yml')
+          config_content = "gems:\n  - #{@settings[:name]}"
+          write(config_path, config_content)
 
-          config_path = File.join(demo_dir, '_config.yml')
-          config_content = "exclude:\n  - Gemfile*"
+          clash_path = File.join(test_dir, '.clash.yml')
+          clash_content = "title: Standard build\nbuild: true\ncompare: _expected _site"
+          write(clash_path, clash_content)
 
-          write(config_path, config_content)
+          puts "#{action}  #{index.sub("#{Dir.pwd}/", '')}"
         end
 
         def self.write(path, contents)

data/lib/octopress-ink/tags/set_lang.rb

@@ -0,0 +1,4 @@
+# A placeholder for smooth integration of Octopress Multilingual
+unless defined? Octopress::Multilingual
+  Liquid::Template.register_tag('set_lang', Liquid::Block)
+end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.29"
+    VERSION = "1.0.0.rc.30"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.29
+  version: 1.0.0.rc.30
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -195,6 +195,7 @@ files:
 - lib/octopress-ink/plugins.rb
 - lib/octopress-ink/tags.rb
 - lib/octopress-ink/tags/javascript.rb
+- lib/octopress-ink/tags/set_lang.rb
 - lib/octopress-ink/tags/stylesheet.rb
 - lib/octopress-ink/version.rb
 homepage: https://github.com/octopress/ink