Blux 0.0.4 → 0.0.5

data/Blux.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Blux}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Louis Salin"]
   s.cert_chain = ["/home/louis/Documents/gem_keys/gem-public_cert.pem"]
-  s.date = %q{2010-10-23}
+  s.date = %q{2010-11-06}
   s.default_executable = %q{blux}
   s.description = %q{An offline blog manager}
   s.email = %q{louis.phil@gmail.com}
   s.executables = ["blux"]
-  s.extra_rdoc_files = ["COPYING", "README.markdown", "bin/blux", "lib/textile_to_html.rb", "lib/wp_publish.rb", "lib/blog_manager.rb", "lib/blux_config_reader.rb", "lib/blux_option_parser.rb", "lib/draft_manager.rb", "lib/indexer.rb"]
-  s.files = ["COPYING", "Manifest", "README.markdown", "Rakefile", "bin/blux", "lib/textile_to_html.rb", "lib/wp_publish.rb", "lib/blog_manager.rb", "lib/blux_config_reader.rb", "lib/blux_option_parser.rb", "lib/draft_manager.rb", "lib/indexer.rb", "spec/blog_manager_spec.rb", "spec/blux_config_reader_spec.rb", "spec/draft_manager_spec.rb", "Blux.gemspec"]
+  s.extra_rdoc_files = ["COPYING", "README.markdown", "bin/blux", "lib/textile_to_html.rb", "lib/blog_manager.rb", "lib/blux_config_reader.rb", "lib/blux_option_parser.rb", "lib/draft_manager.rb", "lib/indexer.rb", "lib/publishing/wp_publish.rb", "lib/publishing/wp_options.rb"]
+  s.files = ["COPYING", "Manifest", "README.markdown", "Rakefile", "bin/blux", "lib/textile_to_html.rb", "lib/blog_manager.rb", "lib/blux_config_reader.rb", "lib/blux_option_parser.rb", "lib/draft_manager.rb", "lib/indexer.rb", "lib/publishing/wp_publish.rb", "lib/publishing/wp_options.rb", "spec/blog_manager_spec.rb", "spec/blux_config_reader_spec.rb", "spec/draft_manager_spec.rb", "Blux.gemspec"]
   s.homepage = %q{http://github.com/louissalin/blux}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Blux", "--main", "README.markdown"]
   s.require_paths = ["lib"]

data/Manifest

@@ -4,12 +4,13 @@ README.markdown
 Rakefile
 bin/blux
 lib/textile_to_html.rb
-lib/wp_publish.rb
 lib/blog_manager.rb
 lib/blux_config_reader.rb
 lib/blux_option_parser.rb
 lib/draft_manager.rb
 lib/indexer.rb
+lib/publishing/wp_publish.rb
+lib/publishing/wp_options.rb
 spec/blog_manager_spec.rb
 spec/blux_config_reader_spec.rb
 spec/draft_manager_spec.rb

data/README.markdown

@@ -74,5 +74,17 @@ use this command to edit a draft
 
 when using the --verbose option, Blux will output a lot of extra information to the screen as it works
 
+>	$ blux -p (--publish) [--latest, --title <a title>, --file <filename>]
+
+this command will publish your draft. It will publish either the latest draft, or a draft with a specific title, or a draft with a specific filename, as specified in the command.
+
+>	$ blux -u (--update) [--latest, --title <a title>, --file <filename>]
+
+this command will update an exisiting published blog post. It will update either the latest draft, or a draft with a specific title, or a draft with a specific filename, as specified in the command.
+
+>	$ blux -d (--delete) [--latest, --title <a title>, --file <filename>]
+
+this command will delete a published blog post and mark the associated draft as deleted. The draft will still exist, but Blux will not take it into consideration anymore.
+
 ## community
 feel free to post your comments or questions to the Blux Google group here: blux_manager@googlegroups.com 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('Blux', '0.0.4') do |p|
+Echoe.new('Blux', '0.0.5') do |p|
 	p.description = 'An offline blog manager'
 	p.url = 'http://github.com/louissalin/blux'
 	p.author = 'Louis Salin'

data/bin/blux

@@ -57,6 +57,43 @@ def check_filename(options, blog_manager)
 	end
 end
 
+def build_post_info(options)
+	switch = nil
+	entry = Array.new
+	response = Array.new
+	url = ""
+
+	ARGF.each do |line| 
+		if line == "--entry--\n"
+			switch = :entry
+			next
+		elsif line == "--response--\n"
+			switch = :response
+			next
+		elsif line == "--url--\n"
+			switch = :url
+			next
+		end
+
+		case (switch)
+		when :entry
+			entry << line
+		when :response
+			response << line
+		when :url
+			url = line
+		end
+	end
+
+	entry_text = entry.join
+	response_text = response.join
+
+	msg = "Error communicating with the publishing script. Exiting..."
+	raise RuntimeError, msg if response.length == 0
+	
+	return entry, response, url
+end
+
 begin
 	validate_command(BluxOptionParser.parse(ARGV)) do |options|
 		draft_manager = DraftManager.new
@@ -84,6 +121,10 @@ begin
 					mgr.draft_manager.set_attribute(filename, attribute, value)
 				end
 			end
+		when :unset
+			check_filename(options, mgr) do |filename|
+				mgr.draft_manager.delete_attribute(filename, options.attribute)
+			end
 		when :out
 			check_filename(options, mgr) do |filename|
 				STDOUT.puts(mgr.draft_manager.output filename)
@@ -103,47 +144,42 @@ begin
 				puts "updating" if options.verbose
 				mgr.update filename
 			end
-		when :set_edit_url
+		when :delete
 			check_filename(options, mgr) do |filename|
-				switch = nil
-				entry = Array.new
-				response = Array.new
-				url = ""
-
-				ARGF.each do |line| 
-					if line == "--entry--\n"
-						switch = :entry
-						next
-					elsif line == "--response--\n"
-						switch = :response
-						next
-					elsif line == "--url--\n"
-						switch = :url
-						next
-					end
-						
-					case (switch)
-					when :entry
-						entry << line
-					when :response
-						response << line
-					when :url
-						url = line
-					end
+				puts "deleting" if options.verbose
+				mgr.delete filename
+			end
+		when :show_post_info
+			entry, response, url = build_post_info(options)
+				if options.verbose
+					puts "entry:" 
+					puts entry 
+
+					puts "response:" 
+					puts response 
+
+					puts "edit url:" 
+					puts url 
 				end
+		when :set_edit_url
+			check_filename(options, mgr) do |filename|
+				entry, response, url = build_post_info(options)
+
+				if options.verbose
+					puts "entry:" 
+					puts entry 
 
-				entry_text = entry.join
-				puts "entry:" if options.verbose
-				puts entry_text if options.verbose
+					puts "response:" 
+					puts response 
+
+					puts "edit url:" 
+					puts url 
+				end
 
-				response_text = response.join
-				puts "response:" if options.verbose
-				puts response_text if options.verbose
-				
-				mgr.set_attribute(filename, 'edit_url', url.strip)
+				mgr.draft_manager.set_attribute(filename, 'edit_url', url.strip)
 			end
 		when :version
-			puts "0.0.4"
+			puts "0.0.5"
 		end
 	end
 rescue 

data/lib/blog_manager.rb

@@ -19,13 +19,12 @@
 require "#{File.dirname(__FILE__)}/draft_manager"
 require "#{File.dirname(__FILE__)}/blux_config_reader"
 require "#{File.dirname(__FILE__)}/indexer"
+require 'timeout'
 
 class BlogManager
 	attr_accessor :home, :blux_dir, :blux_rc, :blux_tmp_dir, :draft_dir
 	attr_accessor :draft_manager 
 	attr_accessor :config
-	attr_accessor :index
-	attr_accessor :index_file
 
 	include BluxIndexer
 
@@ -38,7 +37,6 @@ class BlogManager
 		@draft_dir = "#{@blux_dir}/draft"
 		@blux_tmp_dir = "#{@blux_dir}/tmp"
 		@blux_rc = "#{@home}/.bluxrc"
-		@index_file = "#{@blux_dir}/.published"
 
 		@draft_manager = draft_manager
 	end
@@ -55,10 +53,6 @@ class BlogManager
 		unless Dir.exists?(@blux_tmp_dir)
 			Dir.mkdir(@blux_tmp_dir) 
 		end
-
-		load_index
-		puts "blog index:\n" if @verbose
-		print_index if @verbose
 	end
 
 	def load_config
@@ -69,48 +63,71 @@ class BlogManager
 	end
 
 	def publish(filename)
+		raise "this draft has already been published" if published?(filename)
+
 		title = @draft_manager.get_attribute(filename, "title") || 'no title'
+		categories = @draft_manager.get_attribute(filename, "categories")
 
 		convert_cmd = "blux --convert -f #{filename}"
-		publish_cmd = "ruby #{File.dirname(__FILE__)}/wp_publish.rb -t \"#{title}\" --config #{@blux_rc}"
+		categories_cmd = categories ? "-c \"#{categories}\"" : ""
+		publish_cmd = "ruby #{File.dirname(__FILE__)}/publishing/wp_publish.rb -t \"#{title}\" --config #{@blux_rc} #{categories_cmd}"
 		set_url_cmd = "blux --set_edit_url -f #{filename}"
 
 		cmd = "#{convert_cmd} | #{publish_cmd} | #{set_url_cmd}"
 		cmd = cmd + " --verbose" if @verbose
 
-		if system cmd
-			load_index
-			set_attribute(filename, :published_time, Time.now)
-		else
-			msg = "failed to publish...\n"
-			msg = msg + ' use the --verbose option for more information' if !@verbose
-
-			raise SystemExit, msg
+		send_publish_command(cmd, filename, "failed to publish...") do
+			@draft_manager.set_attribute(filename, "published_time", Time.now)
 		end
-
-		puts "blog index:\n" if @verbose
-		print_index if @verbose
 	end
 
 	def update(filename)
 		title = @draft_manager.get_attribute(filename, "title") || 'no title'
-		url = get_attribute(filename, "edit_url")
+		categories = @draft_manager.get_attribute(filename, "categories")
+		url = @draft_manager.get_attribute(filename, "edit_url")
+
+		raise "couldn't find an edit url for the draft: #{filename}" unless url 
+
+		publish_cmd = "ruby #{File.dirname(__FILE__)}/publishing/wp_publish.rb"
+		categories_cmd = categories ? "-c \"#{categories}\"" : ""
+		post_cmd = "blux --post-cmd"
+		cmd = "blux --convert -f #{filename} | #{publish_cmd} -t \"#{title}\" --update #{url} --config #{@blux_rc} #{categories_cmd} | #{post_cmd}"
+		cmd = cmd + " --verbose" if @verbose
 
+		send_publish_command(cmd, filename, "failed to update...") do
+			@draft_manager.set_attribute(filename, "published_time", Time.now)
+		end
+	end
+
+	def delete(filename)
+		url = @draft_manager.get_attribute(filename, "edit_url")
 		raise "couldn't find an edit url for the draft: #{filename}" unless url 
 
-		publish_cmd = "ruby #{File.dirname(__FILE__)}/wp_publish.rb"
-		cmd = "blux --convert -f #{filename} | #{publish_cmd} -t \"#{title}\" --update #{url} --config #{@blux_rc}"
+		publish_cmd = "ruby #{File.dirname(__FILE__)}/publishing/wp_publish.rb"
+		post_cmd = "blux --post-cmd"
+		cmd = "#{publish_cmd} --delete #{url} --config #{@blux_rc} | #{post_cmd}"
+		cmd = cmd + " --verbose" if @verbose
 
-		if system cmd
-			set_attribute(filename, :published_time, Time.now)
+		send_publish_command(cmd, filename, "failed to delete...") do
+			@draft_manager.delete_draft(filename)
+		end
+	end
+
+private
+
+	def published?(filename)
+		@draft_manager.get_attribute(filename, "published_time") != nil
+	end
+
+	def send_publish_command(cmd, filename, error_msg)
+		status = Timeout::timeout(10) { system cmd }
+		if status
+			yield
 		else
-			msg = "failed to update...\n"
+			msg = "#{error_msg}\n"
 			msg = msg + ' use the --verbose option for more information' if !@verbose
 
 			raise SystemExit, msg
 		end
-
-		puts "blog index:\n" if @verbose
-		print_index if @verbose
 	end
 end

data/lib/blux_option_parser.rb

@@ -44,6 +44,11 @@ class BluxOptionParser
 			opts.on("-s", "--set", "set an attribute on a draft") do
 				options.command = :set
 			end
+			
+			opts.on("--unset ATTR", "delete an attribute on a draft") do |attr|
+				options.command = :unset
+				options.attribute = attr
+			end
 
 			opts.on("-c", "--convert", "convert a draft to html") do
 				options.command = :convert
@@ -61,6 +66,10 @@ class BluxOptionParser
 				options.command = :update
 			end
 
+			opts.on("-d", "--delete", "mark a draft as deleted") do
+				options.command = :delete
+			end
+
 			opts.on("--latest", "work on the latest draft") do
 				options.use_latest = true
 			end
@@ -78,6 +87,10 @@ class BluxOptionParser
 				options.command = :set_edit_url
 			end
 
+			opts.on("--post-cmd", "shows post publishing info: request & response") do
+				options.command = :show_post_info
+			end
+
 			opts.on("--with-preview", "show a preview of each draft while listing") do
 				options.list_preview = true
 			end

data/lib/draft_manager.rb

@@ -25,7 +25,6 @@ require "#{File.dirname(__FILE__)}/indexer"
 class DraftManager
 	attr_reader :launch_editor_cmd
 	attr_reader :temp_dir, :draft_dir
-	attr_reader :index
 	attr_reader :index_file
 
 	include BluxIndexer
@@ -42,7 +41,6 @@ class DraftManager
 		value = system "touch #{@index_file}" unless File.exists? @index_file
 
 		if value
-			load_index
 			print_index if @verbose
 		else
 			msg = 'could not create the draft index file'
@@ -69,8 +67,7 @@ class DraftManager
 	def move_temp_file(tempfile)
 		if system "mv #{tempfile} #{@draft_dir}"
 			index_key = File.basename(tempfile)
-			@index[index_key] = {:creation_time => Time.now.to_s}
-			save_index
+			set_attribute(index_key, "creation_time", Time.now.to_s)
 		else
 			msg = "failed to move the temp file to the draft folder"
 			raise RuntimeError, msg
@@ -90,12 +87,24 @@ class DraftManager
 		print_index if @verbose
 	end
 
+	def delete_draft(filename)
+		set_attribute(filename, "deleted", Time.now.to_s)
+		print_index if @verbose
+	end
+
 	def list
-		Dir.entries(@draft_dir).reject {|i| i[0] == '.'}
+		block = Enumerator.new do |g|
+			index = load_index
+			index.keys.each do |k|
+				g << k if index[k]["deleted"] == nil
+			end
+		end
+
+		block
 	end
 
 	def show_info(filename)
-		check_index(filename) do |index|
+		check_index(filename) do |full_index, index|
 			index.to_json
 		end
 	end
@@ -114,6 +123,7 @@ class DraftManager
 	end
 
 	def output(filename)
+		ensure_not_deleted filename
 		check_filename(filename) do |draft_filename|
 			File.open(draft_filename, 'r') do |f|
 				if f.eof?
@@ -132,7 +142,10 @@ class DraftManager
 
 	def get_latest_created_draft
 		check_count do
-			@index.sort do |a,b| 
+			index = load_index
+			index.reject do |key, val|
+				val["deleted"] != nil
+			end.sort do |a,b| 
 				Time.parse(a[1]["creation_time"]) <=> Time.parse(b[1]["creation_time"])
 			end[-1][0]
 		end
@@ -140,8 +153,9 @@ class DraftManager
 
 	def get_draft_by_title(title)
 		check_count do
-			@index.keys.each do |key|
-				draft_title = @index[key]["title"]
+			index = load_index
+			index.keys.each do |key|
+				draft_title = index[key]["title"]
 				return key if draft_title == title
 			end
 		end

data/lib/indexer.rb

@@ -19,11 +19,12 @@
 module BluxIndexer
 	def check_index(filename)
 		check_filename(filename) do
-			@index[filename] ||= {}
-			yield @index[filename]
+			full_index = load_index
+			full_index[filename] ||= {}
+			yield full_index, full_index[filename]
 		end
 	end
-
+	
 	def check_filename(filename)
 		draft_filename = "#{self.draft_dir}/#{filename}"
 
@@ -35,48 +36,80 @@ module BluxIndexer
 		end
 	end
 
-	def check_title(filename, attr_key, attr_val)
-		return true unless attr_key.to_s == "title"
-		
-		unique_title = true
-		@index.keys.reject{|k| k == filename}.each do |key|
-			unique_title = false if (@index[key][attr_key.to_s] == attr_val)
-		end
-		
-		STDERR << "warning: title '#{attr_val}' is not unique\n" unless unique_title 
-		true
-	end
-
 	def set_attribute(filename, key, val)
-		check_index(filename) do |index|
-			if check_title(filename, key, val)
+		check_index(filename) do |full_index, index|
+			case key
+			when "title"
+				unique_title = true
+				full_index.keys.reject{|k| k == filename}.each do |other_key|
+					unique_title = false if (full_index[other_key.to_s][key] == val)
+				end
+
+				STDERR << "warning: title '#{val}' is not unique\n" unless unique_title 
+
+				index[key.to_s] = val 
+			when "categories"
+				values = Array.new
+				values << index[key.to_s] unless index[key.to_s] == nil
+				values << val
+
+				index[key.to_s] = values.join(',')
+			else
 				index[key.to_s] = val 
-				save_index
 			end
+
+			save_index(full_index)
 		end
 	end
 
 	def delete_attribute(filename, attr_name)
-		check_index(filename) do |index|
-			index.delete(attr_name.to_s)
-			save_index
+		check_index(filename) do |full_index, index|
+			case attr_name
+			when "categories"
+				if block_given?
+					categories = yield 
+					categories_to_remove = categories.split(',')
+
+					values = index[attr_name.to_s].split(',')
+
+					new_values = values.reject{|i| categories_to_remove.include?(i)}.join(',')
+					
+					if new_values.length > 0
+						index[attr_name.to_s] = new_values
+					else
+						index.delete(attr_name.to_s)
+					end
+				else
+					index.delete(attr_name.to_s)
+				end
+			else
+				index.delete(attr_name.to_s)
+			end
+
+			save_index(full_index)
 		end
 	end
 
 	def get_attribute(filename, attribute)
-		check_index(filename) do |index|
+		check_index(filename) do |full_index, index|
 			index[attribute]
 		end
 	end
 
 	def check_count
-		if @index.keys.length > 0
+		index = load_index
+		if index.keys.length > 0
 			yield
 		else
 			msg = "there is currently no saved index"
 			raise RuntimeError, msg
 		end
 	end
+	
+	def delete_index(filename)
+		index = load_index
+		save_index if index.delete filename
+	end
 
 	def load_index
 		system "touch #{@index_file}" unless File.exists? @index_file
@@ -86,16 +119,24 @@ module BluxIndexer
 			f.each_line {|l| str += l}
 		end
 			
-		@index = str.length > 0 ? JSON.parse(str) : {}
+		return str.length > 0 ? JSON.parse(str) : {}
 	end
 
-	def save_index
+	def save_index(index)
 		File.open(@index_file, 'w') do |f| 
-			f.write(@index.to_json) if @index
+			f.write(index.to_json) if index
 		end
 	end
 
 	def print_index
-		puts @index.to_json + "\n" if @verbose
+		index = load_index
+		puts index.to_json + "\n" if @verbose
+	end
+
+	def ensure_not_deleted(filename) 
+		check_index(filename) do |full_index, index|
+			msg = "draft filename #{filename} has been deleted"
+			raise RuntimeError, msg if index["deleted"] 
+		end
 	end
 end