dropsite 0.3.0 → 0.3.1

data/dropsite.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'dropsite'
-  s.version = '0.3.0'
+  s.version = '0.3.1'
   s.platform = Gem::Platform::RUBY
 
   s.description = "creates index pages in your Dropbox public directory"

data/lib/dropsite/application.rb

@@ -7,7 +7,7 @@ module Dropsite
     def run
       handle_options
 
-      options.dropbox_home = Dropsite.dropbox_dir if not options.dropbox_home
+      options.dropbox_home = dropbox_dir if not options.dropbox_home
 
       if !options.dropbox_home || !File.exist?(options.dropbox_home)
         $stderr.puts 'Dropbox home directory cannot be found or does not exist'
@@ -19,8 +19,10 @@ module Dropsite
         create_config_dir
       else
         options.public_dir = File.join(options.dropbox_home, 'Public')
-        cf = ConfigFile.new.read
-        options.exclude = cf.exclude if cf.exist?
+        cf = ConfigFile.new
+        if cf.exist?
+          options.exclude = cf.exclude
+        end
         site = Dropsite::Site.new(options)
         site.process
       end
@@ -31,12 +33,12 @@ module Dropsite
     end
 
     def create_config_dir
-      if Dropsite.dropsite_config_dir
-        puts "Config directory already exists at: #{Dropsite.dropsite_config_dir}"
+      if dropsite_config_dir
+        puts "Config directory already exists at: #{dropsite_config_dir}"
         exit
       end
 
-      config_dir = File.join(Dropsite.dropbox_dir, '.dropsite')
+      config_dir = File.join(dropbox_dir, '.dropsite')
       Dir.mkdir(config_dir)
       File.open(File.join(config_dir, 'config.yml'), 'w') do |f|
         # TODO: put the contents in there
@@ -76,7 +78,7 @@ module Dropsite
     attr_reader :path, :exclude
 
     def initialize(path=nil)
-      @path = path || File.join(Dropsite.dropsite_config_dir, 'config.yml')
+      @path = path || dropsite_config_dir ? File.join(dropsite_config_dir, 'config.yml') : ''
     end
 
     def read

data/lib/dropsite/globals.rb

@@ -0,0 +1,49 @@
+# Some utility methods to dump into Object
+
+# Attempts to find the Dropbox directory (not the Public directory, the Dropbox base
+# directory) on this box. Returns nil if an existing directory could not be found.
+def dropbox_dir
+  return ENV['DROPBOX_HOME'] if ENV['DROPBOX_HOME']
+
+  path = case RUBY_PLATFORM
+  when /darwin/, /linux/, /freebsd/
+    File.join(home_dir, 'Dropbox')
+  when /win32/, /mingw/
+    File.join(home_dir, 'My Documents', 'My Dropbox')
+  end
+
+  File.exist?(path) ? path : nil
+end
+
+# Find the configuration directory for Dropsite. The folder .dropsite is
+# looked for from most "local" to the Public folder outward. First in the
+# Public folder, then the Dropsite directory itself (recommended place) and
+# then the user's home directory.
+def dropsite_config_dir
+  config_dir_name = '.dropsite'
+  [
+    File.join(dropbox_dir, 'Public', config_dir_name),
+    File.join(dropbox_dir, config_dir_name),
+    File.join(home_dir, config_dir_name)
+  ].find {|dir| File.exist? dir}
+end
+
+# Platform-specific home directory
+def home_dir
+  home = ENV['HOME']
+  home = ENV['USERPROFILE'] if not home
+  if !home && (ENV['HOMEDRIVE'] && ENV['HOMEPATH'])
+    home = File.join(ENV['HOMEDRIVE'], ENV['HOMEPATH'])
+  end
+  home = File.expand_path('~') if not home
+  home = 'C:/' if !home && RUBY_PLATFORM =~ /mswin|mingw/
+  home
+end
+
+# Convert a camel-cased string into a lowercase, underscore separated string
+def underscorize(camel_cased_word)
+  camel_cased_word.to_s.gsub(/::/, '/').
+  gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+  gsub(/([a-z\d])([A-Z])/,'\1_\2').
+  tr("-", "_").downcase
+end

data/lib/dropsite/render_helper.rb

@@ -110,11 +110,11 @@ module Dropsite
 
     def plugin_assets_link_base
       if root?
-        "dropsite/dropsite-assets/#{Dropsite.underscorize(rendered_by)}/"
+        "dropsite/dropsite-assets/#{underscorize(rendered_by)}/"
       else
         # Work our way BACK up the path - crazy, right? Gotta do it though.
         dirs_up = path.split(File::SEPARATOR).size - 1
-        (['..'] * dirs_up).join('/') + "#{'/' if dirs_up > 0}dropsite-assets/#{Dropsite.underscorize(rendered_by)}/"
+        (['..'] * dirs_up).join('/') + "#{'/' if dirs_up > 0}dropsite-assets/#{underscorize(rendered_by)}/"
       end
     end
 

data/lib/dropsite/site.rb

@@ -10,7 +10,13 @@ module Dropsite
         @public_dir = config
         @exclude, @disabled_plugins = [], []
         @quiet = false
-      else
+      elsif config.is_a? OpenStruct
+        @config = config.clone
+        @public_dir = config.public_dir
+        @exclude = config.exclude || []
+        @disabled_plugins = config.disabled_plugins || []
+        @quiet = config.quiet || false
+      elsif config.is_a? Hash
         @config = config.clone
         @public_dir = config[:public_dir]
         @exclude = config[:exclude] || []
@@ -61,7 +67,7 @@ module Dropsite
       Dir.mkdir(assets_dir)
       DirRenderer.renderers.each do |r|
         if File.exist? r.assets_dir
-          FileUtils.cp_r(r.assets_dir, File.join(assets_dir, Dropsite.underscorize(r.class.to_s)))
+          FileUtils.cp_r(r.assets_dir, File.join(assets_dir, underscorize(r.class.to_s)))
         end
       end
     end

data/lib/dropsite.rb

@@ -1,55 +1,9 @@
 module Dropsite
-  VERSION = '0.2.1'
-
-  # Attempts to find the Dropbox directory (not the Public directory, the Dropbox base
-  # directory) on this box. Returns nil if an existing directory could not be found.
-  def dropbox_dir
-    return ENV['DROPBOX_HOME'] if ENV['DROPBOX_HOME']
-
-    path = case RUBY_PLATFORM
-    when /darwin/, /linux/, /freebsd/
-      File.join(home_dir, 'Dropbox')
-    when /win32/, /mingw/
-      File.join(home_dir, 'My Documents', 'My Dropbox')
-    end
-
-    File.exist?(path) ? path : nil
-  end
-
-  # Find the configuration directory for Dropsite. The folder .dropsite is
-  # looked for from most "local" to the Public folder outward. First in the
-  # Public folder, then the Dropsite directory itself (recommended place) and
-  # then the user's home directory.
-  def dropsite_config_dir
-    config_dir_name = '.dropsite'
-    [
-      File.join(dropbox_dir, 'Public', config_dir_name),
-      File.join(dropbox_dir, config_dir_name),
-      File.join(home_dir, config_dir_name)
-    ].find {|dir| File.exist? dir}
-  end
-
-  # Platform-specific home directory
-  def home_dir
-    home = ENV['HOME']
-    home = ENV['USERPROFILE'] if not home
-    if !home && (ENV['HOMEDRIVE'] && ENV['HOMEPATH'])
-      home = File.join(ENV['HOMEDRIVE'], ENV['HOMEPATH'])
-    end
-    home = File.expand_path('~') if not home
-    home = 'C:/' if !home && RUBY_PLATFORM =~ /mswin|mingw/
-    home
-  end
-
-  # Convert a camel-cased string into a lowercase, underscore separated string
-  def underscorize(camel_cased_word)
-    camel_cased_word.to_s.gsub(/::/, '/').
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr("-", "_").downcase
-  end
+  VERSION = '0.3.1'
 end
 
-%w[dir_renderer render_helper plugins site site_item site_dir site_file application].each do |lib|
+include Dropsite
+
+%w[globals dir_renderer render_helper plugins site site_item site_dir site_file application].each do |lib|
   require File.join('dropsite', lib)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dropsite
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Aaron Royer
@@ -31,6 +31,7 @@ files:
 - bin/dropsite
 - lib/dropsite/application.rb
 - lib/dropsite/dir_renderer.rb
+- lib/dropsite/globals.rb
 - lib/dropsite/plugins/image_thumbnails/assets/css/image_thumbnails.css
 - lib/dropsite/plugins/image_thumbnails/assets/css/reset.css
 - lib/dropsite/plugins/image_thumbnails/assets/images/icons/directory-large.png