octopress-ink 1.0.0.alpha.34 → 1.0.0.alpha.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1a4f5b802349cd448e8a704fca49677a8fa365
-  data.tar.gz: 2762503e84829b574d8763548c38c2b9fec56b2f
+  metadata.gz: 768fa9c52f22622c7612a91b2b7361a9f6b00e6e
+  data.tar.gz: e35a3eaab4d06c86ba3e114e08c240e593700047
 SHA512:
-  metadata.gz: 877d1fbd6cc33054a5fe2be3d966174b34fda93c35486c33a077a043c5594794c1b05d9feca6b1a84cd46dca70675b38afa10695e36935f40c62f21063a95528
-  data.tar.gz: c12a7d2635f8052c52e508eb57110d8f0f813f663ae9c84c06e7a3e423f80d21601db9f30d779cd1074a9f8c9b33ea5a21fa68d1e06593d1c7dcdc5c006a50b9
+  metadata.gz: e07ec4b06d2b6ee24f78c7913d6b2a8aac6f62b9c0f50b83fa09362781fcad8e192e9e0bf51c4af28e4ae06bb37a16ebf251b584caa2978020f65b17046c6760
+  data.tar.gz: 54358f50230a19b846dfa0185045e6edf37fa67f720dc86924ce621424600764b3d77c9ee814300fab2604cea8db08325625b016f2392553bc58171a21449142

data/lib/octopress-ink/configuration.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Octopress
   module Ink
     module Configuration
@@ -13,7 +15,20 @@ module Octopress
       }
 
       def self.config
-        @config ||= DEFAULTS.deep_merge(Octopress.config)
+        @config ||= DEFAULTS.deep_merge(octopress_config)
+      end
+
+      def self.octopress_config
+        if defined? Octopress.config
+          Octopress.config
+        else
+          file = '_octopress.yml'
+          if File.exist? file
+            YAML.safe_load(File.open(file))
+          else
+            {}
+          end
+        end
       end
     end
   end

data/lib/octopress-ink/plugins.rb

@@ -1,5 +1,3 @@
-require 'octopress'
-
 module Octopress
   module Ink
     module Plugins

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.34"
+    VERSION = "1.0.0.alpha.35"
   end
 end

data/octopress-ink.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "jekyll", "~> 1.4.3"
   spec.add_runtime_dependency "sass", "~> 3.2.0"
-  spec.add_runtime_dependency "octopress", ">= 3.0.0.alpha8"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/Gemfile

@@ -1,7 +1,4 @@
 source 'https://rubygems.org'
 
-group :octopress do
-  gem "octopress-ink", path: "../"
-end
-
+gem "octopress-ink", path: "../"
 gem "pry-debugger"

data/test/test.rb

@@ -38,9 +38,13 @@ end
 
 def build(options={})
   config = ['_config.yml'] << options[:config]
-  cmd = "rm -rf site && bundle exec octopress build --config #{config.join(',')}"
-  cmd += " --octopress-config #{options[:octopress_config]}" if options[:octopress_config]
+  cmd = "rm -rf site && bundle exec jekyll build --config #{config.join(',')}"
+  #cmd += " --octopress-config #{options[:octopress_config]}" if options[:octopress_config]
+  if options[:octopress_config]
+    FileUtils.cp options[:octopress_config], '_octopress.yml'
+  end
   `#{cmd}`
+  `rm _octopress.yml`
 end
 
 def diff_file(file, target_dir='expected', source_dir='site')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.34
+  version: 1.0.0.alpha.35
 platform: ruby
 authors:
 - Brandon Mathis
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: octopress
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0.alpha8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0.alpha8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,8 +94,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- assets/docs/food.html
-- assets/docs/index.html
 - lib/octopress-ink.rb
 - lib/octopress-ink/assets.rb
 - lib/octopress-ink/assets/asset.rb