rypple 0.0.3 → 0.0.4

data/bin/rypple

@@ -1,10 +1,36 @@
 #!/usr/bin/ruby
 
+require 'optparse'
 require 'rubygems'
 require 'rypple'
 
-configDir = File.join(ENV["HOME"], '.rypple')
+#Default options
+options = {:input => '.',
+           :setup => false,}
 
-if File.exists?(configDir)
-  Rypple.sync(configDir)
+opts = OptionParser.new do |opts|
+  opts.banner = "Rypple Version: " + Rypple::VERSION + "\nUsage: rypple [options]"
+#  opts.separator ""
+#  opts.separator "Specific options:"
+
+  opts.on("-s", "--setup",
+          "Runs setup routine for Rypple") do |ext|
+            options[:setup] = true
+  end
+
+  opts.on("-i", "--input [dir]",
+          "Directory to read configuration files and sync with Rypple.") do |ext|
+          options[:input] = ext
+  end
+
+  opts.on_tail("-h", "--help", "Help:") do
+    puts opts
+    exit
+  end
+end.parse!(ARGV)
+
+if options[:setup]
+  Rypple.Setup()
+elsif File.exists?(options[:input])
+  Rypple.sync(options[:input])
 end

data/lib/rypple/base.rb

@@ -7,11 +7,12 @@ module Rypple
   require 'dropbox_sdk'
   require 'pathname'
 
-  ACCESS_TYPE = :app_folder
   DefaultConfiguration = {
     :destinationDir => './test',
     :dropbox => {
+      :root => '/',
       :sync => ['**'],
+      :access_type => :app_folder,
     }
   }
 
@@ -31,6 +32,11 @@ module Rypple
       dropboxKeys[:key] = gets.chomp!
       print "Please enter your Dropbox API secret:"
       dropboxKeys[:secret] = gets.chomp!
+      print "Should this API access be used in sandbox mode? (Y/n):"
+      answer = gets.downcase.chomp
+      if !answer.empty? and answer == 'n'
+        dropboxKeys[:access_type]= :dropbox
+      end
     end
 
     session = nil
@@ -54,7 +60,7 @@ module Rypple
       dropboxKeys[:session] = session.serialize()
     end
 
-    client = DropboxClient.new(session, ACCESS_TYPE)
+    client = DropboxClient.new(session, dropboxKeys[:access_type])
 
     if client.nil?
       return nil, nil, nil
@@ -84,14 +90,14 @@ module Rypple
     return conf
   end
 
-  def Rypple.saveConfig(conf, path)
+  def Rypple.saveDropbox(keys, path)
     dropConfig = File.join(path, DropboxKeyFile)
     File.open(dropConfig, 'w') do|file|
       file.puts keys.to_yaml
     end
   end
 
-  def Rypple.saveDropbox(keys, path)
+  def Rypple.saveConfig(conf, path)
     ryppleConf = File.join(path, RyppleConfigFile)
     File.open(ryppleConf, 'w') do |file|
       file.puts conf.to_yaml
@@ -157,14 +163,25 @@ module Rypple
     destDir = conf[:destinationDir]
 
     oldFileState = dropboxKeys[:files]
-    files = Rypple.walkDropbox(client, '/', oldFileState)
+    files = Rypple.walkDropbox(client, conf[:dropbox][:root], oldFileState)
 
+    rootLength = conf[:dropbox][:root].length
     if !files.nil?
-      files.keys.each { |x|
-        file = client.get_file(x)
-        dest = File.join(destDir, x)
-        File.makedirs(File.dirname(dest))
-        File.open(dest, 'w') {|f| f.puts file}
+      files.keys.each { |xx|
+        fileDest = xx[rootLength, xx.length]
+        matched = false
+        conf[:dropbox][:sync].each { |ii|
+          if File.fnmatch?(ii, xx, File::FNM_DOTMATCH)
+            matched = true
+            break
+          end
+        }
+        if matched
+          file = client.get_file(xx)
+          dest = File.join(destDir, fileDest)
+          File.makedirs(File.dirname(dest))
+          File.open(dest, 'w') {|f| f.puts file}
+        end
       }
     end
 
@@ -172,17 +189,15 @@ module Rypple
       Dir.glob(File.join(destDir, ii)).each { |oo|
         if !File.directory?(oo)
           upName = Pathname.new(oo).relative_path_from(Pathname.new(destDir)).to_s
-          upName = File.join("", upName)
+          upName = File.join("", conf[:dropbox][:root], upName)
           if files.nil? or !files.has_key?(upName)
-            up = File.open(oo)
-            client.put_file(upName, up, true)
-            up.close()
+            File.open(oo) { |f| client.put_file(upName, f, true) }
           end
         end
       }
     }
 
-    dropboxKeys[:files] = Rypple.walkDropbox(client, '/', {})
+    dropboxKeys[:files] = Rypple.walkDropbox(client, conf[:dropbox][:root], {})
     Rypple.cleanup(conf, dropboxKeys, path)
 
     return true

data/lib/rypple/setup.rb

@@ -0,0 +1,190 @@
+require 'rubygems'
+require 'rypple'
+
+module Rypple
+
+  DefaultCGI = <<'eos'
+#!/usr/bin/ruby
+gemPath = "%%GEM_PATH"
+configPath = "%%CONFIG_PATH"
+inDir = "%%IN_DIR"
+outDir = "%%OUT_DIR"
+
+if !gemPath.empty?
+  $:.push(gemPath)
+  ENV['GEM_PATH'] = gemPath
+end
+
+require 'cgi'
+require 'rubygems'
+require 'rypple'
+require 'jekyll'
+
+cgi = CGI.new
+
+puts cgi.header
+
+puts "<h1>Rippling . . .</h1>"
+if Rypple.sync(configPath)
+  puts "<h1>Generating Static Site</h1>"
+  puts `%%COMMAND #{inDir} #{outDir}`
+end
+eos
+
+  DefaultUpdateForm = <<'eos'
+<html>
+  <head>
+    <title>Rypple</title>
+  </head>
+  <body>
+    <h1> Throw a stone into a pond..</h1>
+    <form action="update.cgi" method="POST">
+      <input type="submit" value="Rypple">
+    </form>
+  </body>
+</html>
+eos
+
+  DefaultHTAccess = <<'eos'
+AuthName "Rypple Updater"
+AuthType Basic
+AuthUserFile %%AUTH_FILE
+Require valid-user
+eos
+
+# Returns false if installation fails
+def Rypple.Setup()
+  puts "Configuring the Rypple update script for web use."
+  if File.exists?(ENV["HOME"])
+    configBase = File.join(ENV["HOME"], 'ryppleSite')
+    puts "Please enter directory for Rypple Site. Default:", configBase
+  else
+    puts "Please enter directory for the new Rypple site."
+  end
+  directory = gets.chomp!
+ 
+  if !directory.empty?
+    configBase = File.expand_path(configBase)
+  end
+
+  if !File.exists?(configBase)
+    begin
+      Dir.mkdir(configBase)
+    rescue SystemCallError
+      puts "Cannot create directory", configBase, "aborting."
+      return false
+    end
+  end
+
+  conf = Rypple.loadConfiguration(configBase)
+  conf[:destinationDir] = directory
+  session, client, keys = Rypple.connectToDropbox(configBase)
+  
+  if !conf.nil? and !keys.nil?
+    Rypple.cleanup(conf, keys, configBase)
+  end
+ 
+  baseCGI = DefaultCGI.dup 
+  baseCGI.gsub!(/%%CONFIG_PATH/, configBase)
+  
+  choice = false
+  insert = true
+  while !choice do
+    puts "Is your web host set up to use ruby gems? (y/N)"
+    answer = gets.chomp!.downcase!
+    if answer.nil? or answer.empty?
+      choice = true
+    elsif answer == "n" or answer == "y"
+      insert = (answer == "n")
+      choice = true
+    end
+  end
+  
+  if insert
+    gemPath = ''
+    if ENV.has_key?('GEM_HOME')
+      gemPath = ENV['GEM_HOME']  
+    else
+      puts "Please enter search path for the ruby gems."
+      gemPath = gets.chomp!
+    end
+  
+    baseCGI.gsub!(/%%GEM_PATH/, gemPath)
+  end
+  
+  baseCGI.gsub!(/%%IN_DIR/, configBase)
+  
+  outDir = ""
+  while outDir.empty? or !File.exists?(outDir) do
+    puts "Where should the static site generator output files?"
+    outDir = gets.chomp!
+
+    if !outDir.empty?
+      outDir = File.expand_path(outDir)
+    else
+      puts "Cannot use empty output directory, aborting."
+      return false
+    end
+  
+    if !File.exists?(outDir)
+      begin
+        Dir.mkdir(outDir)
+      rescue SystemCallError
+        puts "Cannot create output directory", outDir
+        next
+      end
+    end
+  end
+
+  baseCGI.gsub!(/%%OUT_DIR/, outDir)
+  
+  command = File.join("#{ENV["GEM_HOME"]}", 'bin', 'jekyll')
+  if File.exists?(command)
+    puts "Please enter any arguments to pass to jekyll"
+    args = gets.chomp!
+    baseCGI.gsub!(/%%COMMAND/, command + ' ' + args)
+  end
+  
+  ryppleDir = File.join(configBase, 'rypple')
+  
+  if !File.exists?(ryppleDir)
+    begin
+      Dir.mkdir(ryppleDir)
+    rescue SystemCallError
+      "Cannot create rypple directory."
+    end
+  end
+  
+  File.open(File.join(ryppleDir, 'update.html'), 'w', 0644) { |f| f.puts DefaultUpdateForm }
+  
+  out = File.join(ryppleDir, 'update.cgi')
+  File.open(out, 'w', 0755) { |f| f.puts baseCGI }
+  
+  puts "Should I enable basic user authentication for the update script? (Y/n):"
+  
+  answer = gets.chomp!
+  if answer.nil? or answer.empty? or answer.downcase! == 'y'
+    print "Enter user name for authentication:"
+    user = gets.chomp!
+    print "Enter password for authentication:"
+    chars = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
+    salt = chars[rand(chars.size - 1)] + chars[rand(chars.size - 1)]
+    pass = gets.chomp!.crypt(salt)
+    authFile = File.join(configBase, '.htpasswd')
+    File.open(authFile, 'w') { |f| f.puts "#{user}:#{pass}" }
+    htaccess = DefaultHTAccess.gsub(/%%AUTH_FILE/, authFile)
+    File.open(File.join(ryppleDir, '.htaccess'), 'w') { |f| f.puts htaccess }
+  end
+
+  puts "Attempting first update"
+  
+  if Rypple.sync(configBase)
+    puts `jekyll #{configBase} #{outDir}`
+  else
+    puts "Rypple sync failed."
+  end
+
+  return true
+end
+
+end

data/lib/rypple/version.rb

@@ -1,3 +1,3 @@
 module Rypple
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/rypple.rb

@@ -1 +1,20 @@
-require 'rypple/base'
+#$:.unshift File.dirname(__FILE__) #For use/testing without the gem.
+
+# Requires all ruby files in a directory.
+#
+# path - Relative path from here to the directory.
+#
+# Returns nothing
+def require_all(path)
+  glob = File.join(File.dirname(__FILE__), path, '*.rb')
+  Dir[glob].each { |f| require f }
+end
+
+require 'rubygems'
+
+require 'fileutils'
+require 'ftools'
+require 'yaml'
+require 'pathname'
+
+require_all 'rypple'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rypple
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jason Ziglar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-28 00:00:00 Z
+date: 2012-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll
@@ -63,6 +63,7 @@ files:
 - bin/ryppleInstall
 - lib/rypple.rb
 - lib/rypple/base.rb
+- lib/rypple/setup.rb
 - lib/rypple/version.rb
 - pkg/ripple-0.0.1.gem
 - rypple.gemspec