lib/octopress-ink.rb in octopress-ink-1.0.0.rc.2 vs lib/octopress-ink.rb in octopress-ink-1.0.0.rc.3

@@ -58,11 +58,15 @@
     def self.config
       @config ||= Configuration.config
     end
 
     def self.site(options={})
-      @site ||= init_site(options)
+      unless @site
+        @site ||= init_site(options)
+      end
+
+      @site
     end
 
     def self.site=(site)
       @site = site
     end
@@ -137,27 +141,35 @@
     end
 
     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
           puts "No files copied from #{name}."
         end
       else
         not_found(name)
       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