octopress-ink 1.0.0.rc.2 → 1.0.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b695c1790cd0bba8f1cc1fc0c0d53d30fdaaca
-  data.tar.gz: 24f76e2a0450a822bc59194e6e88b4fa363b3e4b
+  metadata.gz: e476ab7bb87cbaf0d374bf52ed469ebc89036015
+  data.tar.gz: 9d38606191260e669ad620d8ce594e56403495e8
 SHA512:
-  metadata.gz: b9e478581c5b16475d982fdf4c219b75970b670fc3a4eb1975978006b2f672f1dc977b6131ef95bc33cecfbe65276ffd17bb98598a7a1983a281a24060fb9036
-  data.tar.gz: 08c3aa98a5078ae00aff10a85ed008515506379be8f409f14ae29022f1736d04ea80babc90f8a989170b95c08c977d7354d7d9b59a4a4ac75efbf9d2317740b1
+  metadata.gz: 664d0f6419d7c8941483904059e051b72d7e9bda48c0c85cea78e904354cc8599f0f46b3f4ca99d8027a82fc0f073b5bd334bd2a435437213af28155e8418a2d
+  data.tar.gz: a67dc2f4c8e144b7767ca634ebf02e94ae410a4b32ae9947e0adf62ed890aa6d93e2245d2b4231b8149881a50d248802397d9e3c92892f7539d7c491ac147113

data/CHANGELOG.md

@@ -1,12 +1,17 @@
 # Changelog
 
 ## Current released version
-### 1.0.0 RC2 - 2014-05-26
 
-- Fixed: Post and Page data is appended to at read time.
+### 1.0.0 RC3 - 2014-05-27
+
+- Improved: Now copy and list commands use the flag --config-file instead of --defaults
 
 ## Past versions
 
+### 1.0.0 RC2 - 2014-05-26
+
+- Fixed: Post and Page data is appended to at read time.
+
 ### 1.0.0 RC1 - 2014-05-25
 
 - Initial release candidate

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

@@ -3,6 +3,7 @@ module Octopress
     module Commands
       module CommandHelpers
         def self.add_asset_options(c, action)
+          c.option "config-file", "--config-file", "#{action} plugin's default configuration"
           c.option "layouts", "--layouts", "#{action} only layouts"
           c.option "includes", "--includes", "#{action} only includes"
           c.option "pages", "--pages", "#{action} only pages"
@@ -15,8 +16,7 @@ module Octopress
           c.option "images", "--images", "#{action} only images"
           c.option "fonts", "--fonts", "#{action} only fonts"
           c.option "files", "--files", "#{action} only files"
-          c.option "defaults", "--defaults", "#{action} plugin's default configuration"
-          c.option "config", "--config <CONFIG_FILE>[,CONFIG_FILE2,...]", Array, "Custom configuration file"
+          c.option "config", "--config <CONFIG_FILE>[,CONFIG_FILE2,...]", Array, "Custom Jekyll configuration file"
         end
       end
     end

data/lib/octopress-ink/plugin.rb

@@ -116,7 +116,7 @@ module Octopress
       #
       def add_asset_files(options)
         select_assets(options).each do |name, assets|
-          next if name == 'defaults'
+          next if name == 'config-file'
           assets.each {|file| file.add unless file.disabled? }
         end
       end
@@ -130,6 +130,7 @@ module Octopress
           next if name == 'docs'
           assets.each { |a| copied << a.copy(path) }
         end
+
         copied
       end
 
@@ -148,7 +149,7 @@ module Octopress
       # returns: Hash of merged user and default config.yml files
       #
       def config
-        @config ||= defaults.read
+        @read_config ||= config_defaults.read
       end
 
       # Remove files from Jekyll since they'll be proccessed by Ink instead
@@ -183,8 +184,8 @@ module Octopress
         config['disable'] = disabled
       end
 
-      def defaults
-        @defaults ||= Assets::Config.new(self, @config_file)
+      def config_defaults
+        @config ||= Assets::Config.new(self, @config_file)
       end
 
 
@@ -216,7 +217,7 @@ module Octopress
           'images'      => @images, 
           'fonts'       => @fonts, 
           'files'       => @files,
-          'defaults'    => [@defaults]
+          'config-file' => [@config]
         }
       end
       
@@ -232,7 +233,7 @@ module Octopress
           when 'docs'
             header = "documentation: /#{docs_base_path}/"
             message += asset_list(assets, header)
-          when 'defaults'
+          when 'config-file'
             message += asset_list(assets, 'default configuration')
           else
             message += asset_list(assets, name)

data/lib/octopress-ink/version.rb

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

data/lib/octopress-ink.rb

@@ -60,7 +60,11 @@ module Octopress
     end
 
     def self.site(options={})
-      @site ||= init_site(options)
+      unless @site
+        @site ||= init_site(options)
+      end
+
+      @site
     end
 
     def self.site=(site)
@@ -139,16 +143,11 @@ module Octopress
     def self.copy_plugin_assets(name, options)
       site(options)
       Plugins.register
-      if path = options.delete('path')
-        full_path = File.join(Ink.site.source, path)
-        if !Dir["#{full_path}/*"].empty? && options['force'].nil?
-          abort "Error: directory #{path} is not empty. Use --force to overwrite files."
-        end
-      else
-        full_path = File.join(Ink.site.source, Plugins.custom_dir, name)
-      end
+      path = copy_path(name, options)
+
+
       if p = plugin(name)
-        copied = p.copy_asset_files(full_path, options)
+        copied = p.copy_asset_files(path, options)
         if !copied.empty?
           puts "Copied files:\n#{copied.join("\n")}"
         else
@@ -159,6 +158,19 @@ module Octopress
       end
     end
 
+    def self.copy_path(name, options)
+      if path = options.delete('path')
+        full_path = File.join(Ink.site.source, path)
+        if !Dir["#{full_path}/*"].empty? && options['force'].nil?
+          abort "Error: directory #{path} is not empty. Use --force to overwrite files."
+        end
+      else
+        full_path = File.join(Ink.site.source, Plugins.custom_dir, name)
+      end
+
+      full_path
+    end
+
     def self.list_plugins(options={})
       site(options)
       Plugins.register

data/test/copy_test/_copy/stylesheets/disable.sass

@@ -1 +1,2 @@
-.do-not-exist { background: #f00; }
+.do-not-exist
+  background: #f00

data/test/plugins/test-theme/stylesheets/disable.sass

@@ -1 +1,2 @@
-.do-not-exist { background: #f00; }
+.do-not-exist
+  background: #f00

data/test/source/_posts/2014-02-01-test-post.md

@@ -1,4 +1,5 @@
 ---
+title: Test Post
 layout: theme:test
 external-url: http://timecube.com
 ---

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.2
+  version: 1.0.0.rc.3
 platform: ruby
 authors:
 - Brandon Mathis