woody 0.1.0 → 0.1.1

data/README.md

@@ -7,6 +7,9 @@ Podcast static site generator
 To install, run this:
 
     $ gem install woody
+    
+## To Do List/Roadmap
+[Here, on trello](https://trello.com/board/woody-to-do-list/50c7903cc0e26dc906001fd6)
 
 ## Usage
 

data/lib/woody/compiler.rb

@@ -1,6 +1,7 @@
 module Woody
   # Handles functions related to compiling the Woody site
   module Compiler
+    @@touchedfiles = []
 
     # Compiles the Woody site
     def self.compile(options = [])
@@ -9,7 +10,6 @@ module Woody
 
       episodes     = Array.new
       filesfound   = Array.new
-      touchedfiles = Array.new
       Dir.glob('content/*.mp3') do |file|
         filename = file[8..-1]
         unless meta == false or meta[filename].nil?
@@ -41,12 +41,11 @@ module Woody
 
       # Copy over (TODO: and process) MP3 files
       episodes.each do |episode|
-        FileUtils.copy "content/#{episode.filename}", "output/assets/mp3/#{episode.compiledname}"
-        touchedfiles << "assets/mp3/#{episode.compiledname}"
+        copy_file_to_output File.join("content", episode.filename), File.join("assets/mp3", episode.compiledname)
       end
 
       # Copy over assets
-      copy_assets_r touchedfiles
+      copy_assets
 
       # Update index.html
       layout = File.read('templates/layout.html')
@@ -59,8 +58,7 @@ module Woody
           ep.result(config: $config, episodes: episodes, episode: episode)
         end
       end
-      File.open('output/index.html', 'w') {|f| f.write(index_compiled) }
-      touchedfiles << 'index.html'
+      write_output_file('index.html') {|f| f.write(index_compiled) }
 
       # Update episode pages
       episodes.each do |episode|
@@ -70,15 +68,13 @@ module Woody
           ep = Erubis::Eruby.new(File.read('templates/episode.html'))
           ep.result(config: $config, episodes: episodes, episode: episode)
         end
-        File.open("output/#{episode.path(false)}", 'w') {|f| f.write(episode_compiled) }
-        touchedfiles << episode.path(false)
+        write_output_file(episode.path) {|f| f.write(episode_compiled) }
       end
 
       # Copy over iTunes.png
-      if File.exist? "content/iTunes.png"
-        FileUtils.copy "content/iTunes.png", "output/assets/iTunes.png"
-        touchedfiles << "assets/iTunes.png"
-      else
+      begin
+        copy_file_to_output "content/iTunes.png", "assets/iTunes.png"
+      rescue Errno::ENOENT
         puts "Warning: content/iTunes.png missing!"
       end
 
@@ -86,15 +82,15 @@ module Woody
       itunes = File.read "#{$source_root}/itunes.xml" # Use itunes.xml template in gem, not in site's template folder.
       itunes = Erubis::Eruby.new(itunes)
       itunes_compiled = itunes.result(config: $config, episodes: episodes)
-      File.open("output/itunes.xml", 'w') {|f| f.write(itunes_compiled) }
-      touchedfiles << "itunes.xml"
+      write_output_file("itunes.xml") {|f| f.write(itunes_compiled) }
+
 
 
       # Update General RSS
 
 
       # Purge left over files
-      purge_output(touchedfiles)
+      purge_output
 
       # Remove all empty directories from the output
       Dir['output/**/*'].select { |d| File.directory? d }.select { |d| (Dir.entries(d) - %w[ . .. ]).empty? }.each { |d| Dir.rmdir d }
@@ -102,6 +98,23 @@ module Woody
 
     private
 
+    # Safely copies files to the output directory
+    def self.copy_file_to_output(source, destination)
+      d = File.join("output", destination)
+      FileUtils.copy source, d
+      @@touchedfiles << d
+    end
+
+    # Safely writes files to the output directory
+    def self.write_output_file(filename, &block)
+      file = File.join("output", filename)
+      File.open(file, 'w') do |f|
+        yield f
+      end
+      @@touchedfiles << file
+    end
+
+    # Prompts for metadata for new media files
     def self.prompt_metadata(meta, episodes, filesfound, filename)
       puts "Found new media file: #{filename}"
       if agree("Add metadata for this file? ")
@@ -129,33 +142,23 @@ module Woody
       end
     end
 
-    # Copies custom assets to output recursively
-    def self.copy_assets_r(touchedfiles, subdir="")
-      Dir.foreach("templates/assets/#{subdir}") do |item|
-        next if item == '.' or item == '..'
-        unless File.directory?("templates/assets/#{subdir}#{item}")
-          FileUtils.copy "templates/assets/#{subdir}#{item}", "output/assets/#{subdir}#{item}"
-          touchedfiles << "assets/#{subdir}#{item}"
-        else
-          FileUtils.mkdir_p "output/assets/#{subdir}#{item}"
-          copy_assets_r touchedfiles, "#{subdir}#{item}/"
-        end
+    # Copies custom assets to output
+    def self.copy_assets
+      Dir.glob "templates/assets/**/*" do |item|
+        next if File.directory? item
+        d = item[10..-1] # Cut off "templates/" at beginning
+        copy_file_to_output item, d
       end
     end
 
+
     # Deletes old files from the site's output directory
-    # @param [Array]  touchedfiles specifies which files to keep
-    # @param [String] subdir specifies a subdirectory of output/ to work in (used for recursion)
-    def self.purge_output(touchedfiles, subdir = "")
-      Dir.foreach("output/#{subdir}") do |item|
-        next if item == '.' or item == '..'
-        p = "#{subdir}#{item}"
-        begin
-          File.delete "output/#{subdir}#{item}" unless touchedfiles.include? p
-        rescue Errno::EISDIR, Errno::EPERM # Rescuing EPERM seems to be necessary on macs, hmm :/
-          purge_output touchedfiles, "#{p}/"
-        end
+    def self.purge_output
+      Dir.glob "output/**/*" do |item|
+        next if File.directory? item
+        File.delete item unless @@touchedfiles.include? item
       end
     end
+
   end
 end

data/lib/woody/deployer.rb

@@ -1,55 +1,33 @@
 module Woody
   # Handles functions relating to deploying the Woody site
   module Deployer
+    @@touchedfiles = []
     # Deploys the Woody site to S3
     def self.deploy
-      touchedfiles = Array.new
-      deploy_r touchedfiles
+      puts "Deploying..."
+
+      Dir.glob "output/**/*" do |item|
+        next if File.directory? item
+        name = item[7..-1] # Remove "output/"
+        upload name, item
+      end
 
       # Purge left over files
-      purge_bucket touchedfiles
+      purge_bucket
     end
 
     private
 
-    def self.deploy_r(touchedfiles, subdir = "")
-      puts "Deploying... " if subdir == ""
-      Dir.foreach("output/#{subdir}") do |item|
-        next if item == '.' or item == '..'
-        begin
-          touchedfiles << "#{subdir}#{item}"
-          upload("#{subdir}#{item}", "output/#{subdir}#{item}")
-        rescue Errno::EISDIR
-          deploy_r touchedfiles, "#{subdir}#{item}/"
-        end
-      end
-    end
 
     # Deletes old objects from the S3 bucket
     # @param [Array] touchedfiles specifies the S3 objects to keep
-    def self.purge_bucket(touchedfiles)
+    def self.purge_bucket
       bucket = AWS::S3::Bucket.find $bucketname
       bucket.objects.each do |object|
-        object.delete unless touchedfiles.include? object.key
+        object.delete unless @@touchedfiles.include? object.key
       end
     end
 
-    # Generates a hash of a file
-    # Stored in S3 object metadata (x-amz-meta-hash) and used to avoid re-uploading unchanged files
-    # @param  [String] filepath path to file
-    # @return [String] hash of file
-    def self.filehash(filepath)
-      sha1 = Digest::SHA1.new
-      File.open(filepath) do|file|
-        buffer = ''
-        # Read the file 512 bytes at a time
-        while not file.eof
-          file.read(512, buffer)
-          sha1.update(buffer)
-        end
-      end
-      return sha1.to_s
-    end
 
     # Uploads a file to S3
     # Sets x-amz-meta-hash to hash generated by Woody::Generator.filehash and checks this
@@ -60,7 +38,7 @@ module Woody
     def self.upload(objectname, filepath)
       # Generate hash of file
       hash = filehash filepath
-
+      @@touchedfiles << objectname
       # Get hash of version already uploaded, if available.
       begin
         object = AWS::S3::S3Object.find objectname, $bucketname
@@ -77,5 +55,24 @@ module Woody
         puts "#{objectname}: Not uploading, hasn't changed since last time."
       end
     end
+
+
+    # Generates a hash of a file
+    # Stored in S3 object metadata (x-amz-meta-hash) and used to avoid re-uploading unchanged files
+    # @param  [String] filepath path to file
+    # @return [String] hash of file
+    def self.filehash(filepath)
+      sha1 = Digest::SHA1.new
+      File.open(filepath) do|file|
+        buffer = ''
+        # Read the file 512 bytes at a time
+        while not file.eof
+          file.read(512, buffer)
+          sha1.update(buffer)
+        end
+      end
+      return sha1.to_s
+    end
+
   end
 end

data/lib/woody/version.rb

@@ -1,4 +1,4 @@
 module Woody
   # Specifies Woody gem version
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woody
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis