Blux 0.0.3 → 0.0.4

data/Blux.gemspec

@@ -2,17 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Blux}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   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-10}
+  s.date = %q{2010-10-23}
+  s.default_executable = %q{blux}
   s.description = %q{An offline blog manager}
   s.email = %q{louis.phil@gmail.com}
-  s.executables = ["blux", "blux_textile_to_html", "blux_wp_publish"]
-  s.extra_rdoc_files = ["COPYING", "README.markdown", "bin/blux", "bin/blux_textile_to_html", "bin/blux_wp_publish", "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", "bin/blux_textile_to_html", "bin/blux_wp_publish", "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.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.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

@@ -3,8 +3,8 @@ Manifest
 README.markdown
 Rakefile
 bin/blux
-bin/blux_textile_to_html
-bin/blux_wp_publish
+lib/textile_to_html.rb
+lib/wp_publish.rb
 lib/blog_manager.rb
 lib/blux_config_reader.rb
 lib/blux_option_parser.rb

data/README.markdown

@@ -10,7 +10,6 @@ That's it!
 Blux reads its configuration info from  ~/.bluxrc. The first time you run blux, it will create this file for you, but will immediately complain about missing configuration items. Use the following configuration example for a Wordpress blog and edit each line as needed:
 
 	editor: vim
-	html_converter: blux_textile_to_html
 	
 	blog: myWordpressBlog
 	author_name: Mr. Author
@@ -19,8 +18,6 @@ Blux reads its configuration info from  ~/.bluxrc. The first time you run blux,
 
 **editor:** this is the shell command that will be executed to launch your editor of choice
 
-**html_converter:** Blux will use this shell command to convert your blog draft to html. In the example above, Blux will use the blux_textile_to_html script, which is included with this application. The script will transform your post, written in the textile markup language, and convert it to html.
-
 **blog:** this is your Wordpress blog ID
 
 **author_name:** the name of the author

data/Rakefile

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

data/bin/blux

@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Blux.  If not, see <http://www.gnu.org/licenses/>.
 
+require 'atom/entry' # sudo gem install atom-tools
 require "#{File.dirname(__FILE__)}/../lib/blux_option_parser.rb"
 require "#{File.dirname(__FILE__)}/../lib/blog_manager.rb"
 
@@ -25,7 +26,8 @@ def validate_command(options)
 	if (options.command != nil)
 		yield options
 	else
-		STDERR << "No command specified. Use -h for a list of possible commands\n"
+		msg = "No command specified. Use -h for a list of possible commands"
+		raise RuntimeError, msg
 	end
 end
 
@@ -33,7 +35,8 @@ def validate_set_options(options)
 	if options.attributes.length.modulo(2) == 0
 		yield options.attributes[0], options.attributes[1]
 	else
-		STDERR << "Attribute error: you must specify an attribute name and a value."
+		msg = "Attribute error: you must specify an attribute name and a value."
+		raise RuntimeError, msg
 	end
 end
 
@@ -46,62 +49,105 @@ def check_filename(options, blog_manager)
 	if filename != nil
 		yield filename
 	else
-		STDERR << "Please specify the draft file you want to work with. If you want to work with the latest created/edited draft, use the --latest option. You can also tell blux to get a draft with a specific title with --title."
+		msg = "Please specify the draft file you want to work with.\n"
+		msg = msg + "  Try using the --latest option to use the latest draft.\n"
+		msg = msg + "  Or try to get a draft with a specific title with the --title option."
+
+		raise RuntimeError, msg
 	end
 end
 
-validate_command(BluxOptionParser.parse(ARGV)) do |options|
-	puts "#{options}" if options.verbose
-
-	draft_manager = DraftManager.new
-	mgr = BlogManager.new(draft_manager, :verbose => options.verbose)	
-	mgr.load_config
-	mgr.start
+begin
+	validate_command(BluxOptionParser.parse(ARGV)) do |options|
+		draft_manager = DraftManager.new
+		mgr = BlogManager.new(draft_manager, :verbose => options.verbose)	
+		mgr.load_config
+		mgr.start
 
-	case options.command
-	when :new
-		mgr.draft_manager.create_draft
-	when :edit
-		check_filename(options, mgr) do |filename|
-			mgr.draft_manager.edit_draft filename
-		end
-	when :list
-		mgr.draft_manager.list.each do |item|
-			break if options.filename != nil && options.filename != item
-			puts "#{item}"
-			puts "  #{mgr.draft_manager.show_info(item)}" if options.list_details
-			puts "  #{mgr.draft_manager.show_preview(item)}" if options.list_preview
-		end
-	when :set
-		check_filename(options, mgr) do |filename|
-			validate_set_options(options) do |attribute, value|
-				mgr.draft_manager.set_attribute(filename, attribute, value)
+		case options.command
+		when :new
+			mgr.draft_manager.create_draft
+		when :edit
+			check_filename(options, mgr) do |filename|
+				mgr.draft_manager.edit_draft filename
 			end
-		end
-	when :out
-		check_filename(options, mgr) do |filename|
-			STDOUT.puts(mgr.draft_manager.output filename)
-		end
-	when :convert
-		check_filename(options, mgr) do |filename|
-			system "blux --out -f #{filename} | #{mgr.config.html_converter_cmd}"
-		end
-	when :publish
-		check_filename(options, mgr) do |filename|
-			puts "publishing" if options.verbose
-			mgr.publish filename
-		end
-	when :update
-		check_filename(options, mgr) do |filename|
-			puts "updating" if options.verbose
-			mgr.update filename
-		end
-	when :set_edit_url
-		check_filename(options, mgr) do |filename|
-			ARGF.each do |url|
+		when :list
+			mgr.draft_manager.list.each do |item|
+				break if options.filename != nil && options.filename != item
+				puts "#{item}"
+				puts "  #{mgr.draft_manager.show_info(item)}" if options.list_details
+				puts "  #{mgr.draft_manager.show_preview(item)}" if options.list_preview
+			end
+		when :set
+			check_filename(options, mgr) do |filename|
+				validate_set_options(options) do |attribute, value|
+					mgr.draft_manager.set_attribute(filename, attribute, value)
+				end
+			end
+		when :out
+			check_filename(options, mgr) do |filename|
+				STDOUT.puts(mgr.draft_manager.output filename)
+			end
+		when :convert
+			check_filename(options, mgr) do |filename|
+				convert_cmd = "ruby #{File.dirname(__FILE__)}/../lib/textile_to_html.rb"
+				system "blux --out -f #{filename} | #{convert_cmd}"
+			end
+		when :publish
+			check_filename(options, mgr) do |filename|
+				puts "publishing" if options.verbose
+				mgr.publish filename
+			end
+		when :update
+			check_filename(options, mgr) do |filename|
+				puts "updating" if options.verbose
+				mgr.update filename
+			end
+		when :set_edit_url
+			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
+				end
+
+				entry_text = entry.join
+				puts "entry:" if options.verbose
+				puts entry_text if options.verbose
+
+				response_text = response.join
+				puts "response:" if options.verbose
+				puts response_text if options.verbose
+				
 				mgr.set_attribute(filename, 'edit_url', url.strip)
 			end
+		when :version
+			puts "0.0.4"
 		end
 	end
+rescue 
+	STDERR << "fatal error: #{$!}\n"
+	exit 1
 end
 

data/lib/blog_manager.rb

@@ -45,21 +45,20 @@ class BlogManager
 
 	def start
 		unless Dir.exists?(@blux_dir)
-			puts "creating #{@blux_dir}\n" if @verbose
 			Dir.mkdir(@blux_dir) 
 		end
 
 		unless Dir.exists?(@draft_dir)
-			puts "creating #{@draft_dir}\n" if @verbose
 			Dir.mkdir(@draft_dir) 
 		end
 
 		unless Dir.exists?(@blux_tmp_dir)
-			puts "creating #{@blux_tmp_dir}\n" if @verbose
 			Dir.mkdir(@blux_tmp_dir) 
 		end
 
 		load_index
+		puts "blog index:\n" if @verbose
+		print_index if @verbose
 	end
 
 	def load_config
@@ -72,14 +71,25 @@ class BlogManager
 	def publish(filename)
 		title = @draft_manager.get_attribute(filename, "title") || 'no title'
 
-		cmd = "blux --convert -f #{filename} | blux_wp_publish -t #{title} --config #{@blux_rc} | blux --set_edit_url -f #{filename}"
+		convert_cmd = "blux --convert -f #{filename}"
+		publish_cmd = "ruby #{File.dirname(__FILE__)}/wp_publish.rb -t \"#{title}\" --config #{@blux_rc}"
+		set_url_cmd = "blux --set_edit_url -f #{filename}"
+
+		cmd = "#{convert_cmd} | #{publish_cmd} | #{set_url_cmd}"
 		cmd = cmd + " --verbose" if @verbose
 
-		puts cmd if @verbose
-		system cmd
-		
-		load_index
-		set_attribute(filename, :published_time, Time.now)
+		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
+		end
+
+		puts "blog index:\n" if @verbose
+		print_index if @verbose
 	end
 
 	def update(filename)
@@ -88,12 +98,19 @@ class BlogManager
 
 		raise "couldn't find an edit url for the draft: #{filename}" unless url 
 
-		cmd = "blux --convert -f #{filename} | blux_wp_publish.rb -t #{title} --update #{url} --config #{@blux_rc}"
+		publish_cmd = "ruby #{File.dirname(__FILE__)}/wp_publish.rb"
+		cmd = "blux --convert -f #{filename} | #{publish_cmd} -t \"#{title}\" --update #{url} --config #{@blux_rc}"
+
+		if system cmd
+			set_attribute(filename, :published_time, Time.now)
+		else
+			msg = "failed to update...\n"
+			msg = msg + ' use the --verbose option for more information' if !@verbose
+
+			raise SystemExit, msg
+		end
 
-		puts cmd if @verbose
-		system cmd
-		
-		set_attribute(filename, :published_time, Time.now)
+		puts "blog index:\n" if @verbose
+		print_index if @verbose
 	end
-	
 end

data/lib/blux_config_reader.rb

@@ -17,12 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Blux.  If not, see <http://www.gnu.org/licenses/>.
 class BluxConfigurationReader
-	attr_reader :launch_editor_cmd, :html_converter_cmd
+	attr_reader :launch_editor_cmd
 	attr_reader :blog, :author_name, :user_name, :password
 
 	def load_config(blux_rc, verbose = false)
 		unless File.exists? blux_rc
-			puts "creating #{blux_rc}\n" if verbose
 			system "touch #{blux_rc}" 
 		end
 
@@ -30,10 +29,6 @@ class BluxConfigurationReader
 		match = line =~ /^editor:\s(.+)$/
 		@launch_editor_cmd = $1
 
-		line = `grep html_converter: #{blux_rc}`
-		match = line =~ /^html_converter:\s(.+)$/
-		@html_converter_cmd = $1
-
 		line = `grep blog: #{blux_rc}`
 		match = line =~ /^blog:\s(.+)$/
 		@blog = $1
@@ -50,34 +45,34 @@ class BluxConfigurationReader
 		match = line =~ /^password:\s(.+)$/
 		@password = $1
 
-		puts "editor command: #{@launch_editor_cmd}\n" if verbose
 		validate
 	end
 
 private
 	def validate
 		if (@launch_editor_cmd == nil)
-			STDERR.puts "please specify an editor in .bluxrc: editor: [your editor of choice]\n"
-		end
-
-		if (@html_converter_cmd == nil)
-			STDERR.puts "please specify an html converter in .bluxrc: html_converter: [your converter command of choice]\n"
+			msg = "please specify an editor in .bluxrc:\n  editor: [your editor of choice]"
+			raise RuntimeError, msg
 		end
 
 		if (@blog == nil)
-			STDERR.puts "please specify your wordpress blog name in .bluxrc: blog: [your blog]\n"
+			msg = "please specify your wordpress blog name in .bluxrc:\n  blog: [your blog]"
+			raise RuntimeError, msg
 		end
 
 		if (@author_name == nil)
-			STDERR.puts "please specify an author name in .bluxrc: author_name: [your name]\n"
+			msg = "please specify an author name in .bluxrc:\n  author_name: [your name]"
+			raise RuntimeError, msg
 		end
 
 		if (@user_name == nil)
-			STDERR.puts "please specify your wordpress user name in .bluxrc: user_name: [your user name]\n"
+			msg = "please specify your wordpress user name in .bluxrc:\n  user_name: [your user name]"
+			raise RuntimeError, msg
 		end
 
 		if (@password == nil)
-			STDERR.puts "please specify your wordpress password in .bluxrc: password: [your password]\n"
+			msg = "please specify your wordpress password in .bluxrc:\n  password: [your password]"
+			raise RuntimeError, msg
 		end
 	end
 end

data/lib/blux_option_parser.rb

@@ -90,6 +90,10 @@ class BluxOptionParser
 				options.verbose = true
 			end
 
+			opts.on("--version", "print version information") do
+				options.command = :version
+			end
+
 			opts.on_tail("-h", "--help", "show this message") do
 				puts opts
 				exit

data/lib/draft_manager.rb

@@ -26,6 +26,7 @@ class DraftManager
 	attr_reader :launch_editor_cmd
 	attr_reader :temp_dir, :draft_dir
 	attr_reader :index
+	attr_reader :index_file
 
 	include BluxIndexer
 
@@ -37,39 +38,56 @@ class DraftManager
 		@draft_dir = draft_dir
 		@index_file = "#{@draft_dir}/.draft_index"
 
-		system "touch #{@index_file}" unless File.exists? @index_file
+		value = true
+		value = system "touch #{@index_file}" unless File.exists? @index_file
 
-		load_index
+		if value
+			load_index
+			print_index if @verbose
+		else
+			msg = 'could not create the draft index file'
+			raise RuntimeError, msg
+		end
 	end
 
 	def create_draft
 		temp_file = Tempfile.new('draft', @temp_dir)
 		temp_file.close
 
-		puts "created temp file #{temp_file.path}\nlaunching editor\n" if @verbose
-
-		system "#{@launch_editor_cmd} #{temp_file.path}"
-
-		puts "editor closed. File size: #{temp_file.size}\n" if @verbose
-		if temp_file.size > 0
-			system "mv #{temp_file.path} #{@draft_dir}"
+		if system "#{@launch_editor_cmd} #{temp_file.path}"
+			if temp_file.size > 0
+				move_temp_file temp_file.path
+			end
+		else
+			msg = "couldn't launch editor with command #{@launch_editor_cmd}"
+			raise RuntimeError, msg
+		end
 
-			index_key = File.basename(temp_file.path)
-			puts "adding #{index_key} to draft index\n" if @verbose
+		print_index if @verbose
+	end
+	
+	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
+		else
+			msg = "failed to move the temp file to the draft folder"
+			raise RuntimeError, msg
 		end
 	end
 
 	def edit_draft(filename)
-		puts "editing draft #{filename}" if @verbose
-
 		check_filename(filename) do  |draft_filename|
-			puts "editing: #{@launch_editor_cmd} #{draft_filename}" if @verbose
-
-			system "#{@launch_editor_cmd} #{draft_filename}"
-			set_attribute(filename, "edited_time", Time.now.to_s)
+			if system "#{@launch_editor_cmd} #{draft_filename}"
+				set_attribute(filename, "edited_time", Time.now.to_s)
+			else
+				msg = "couldn't launch editor with command #{@launch_editor_cmd}"
+				raise RuntimeError, msg
+			end
 		end
+
+		print_index if @verbose
 	end
 
 	def list

data/lib/indexer.rb

@@ -25,12 +25,13 @@ module BluxIndexer
 	end
 
 	def check_filename(filename)
-		draft_filename = "#{@draft_dir}/#{filename}"
+		draft_filename = "#{self.draft_dir}/#{filename}"
 
 		if (File.exists?(draft_filename))
 			yield draft_filename
 		else
-			STDERR.puts "draft filename #{filename} does not exist\n"
+			msg = "draft filename #{filename} does not exist"
+			raise RuntimeError, msg
 		end
 	end
 
@@ -42,14 +43,13 @@ module BluxIndexer
 			unique_title = false if (@index[key][attr_key.to_s] == attr_val)
 		end
 		
-		STDERR.puts "title '#{attr_val}' is not unique\n" unless unique_title 
-		unique_title
+		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)
-				puts "setting attribute #{key} to #{val} in index #{@index_file}" if @verbose
 				index[key.to_s] = val 
 				save_index
 			end
@@ -73,12 +73,12 @@ module BluxIndexer
 		if @index.keys.length > 0
 			yield
 		else
-			STDERR.puts "there is currently no saved index\n"
+			msg = "there is currently no saved index"
+			raise RuntimeError, msg
 		end
 	end
 
 	def load_index
-		puts "creating #{@index_file}\n" if @verbose
 		system "touch #{@index_file}" unless File.exists? @index_file
 
 		str = ''
@@ -90,9 +90,12 @@ module BluxIndexer
 	end
 
 	def save_index
-		puts "saving index: #{@index.to_json}\n" if @verbose
 		File.open(@index_file, 'w') do |f| 
 			f.write(@index.to_json) if @index
 		end
 	end
+
+	def print_index
+		puts @index.to_json + "\n" if @verbose
+	end
 end

data/{bin/blux_wp_publish → lib/wp_publish.rb}

@@ -10,7 +10,7 @@ require 'optparse'
 require 'net/http'
 require 'atom/entry' # sudo gem install atom-tools
 require 'atom/collection'
-require "#{File.dirname(__FILE__)}/../lib/blux_config_reader"
+require "#{File.dirname(__FILE__)}/blux_config_reader"
 
 
 #
@@ -134,6 +134,13 @@ h.always_auth = :basic
 c = Atom::Collection.new(base + "/posts", h)
 if command == :post
 	res = c.post! entry
+	puts "--entry--"
+	puts entry
+
+	puts "--response--"
+	puts res 
+
+	puts "--url--"
 	puts Atom::Entry.parse(res.read_body).edit_url
 elsif command == :put
 	entry.edit_url = entry_id

data/spec/blog_manager_spec.rb

@@ -9,6 +9,7 @@ describe BlogManager do
 		@draft_dir = "#{@blux_dir}/draft"
 
 		Dir.mkdir(@blux) unless Dir.exists?(@blux)
+		Dir.mkdir(@draft_dir) unless Dir.exists?(@draft_dir)
 
 		def STDERR.puts(str) end
 
@@ -26,7 +27,7 @@ describe BlogManager do
 
 	context "loading with no config file" do
 		before :each do
-			@manager.load_config
+			lambda {@manager.load_config}.should raise_error
 		end
 
 		it "should create an empty config file it doesn't exist" do
@@ -103,22 +104,25 @@ describe BlogManager do
 				f.write('{"draft5.67":{"a":1,"b":2}}')
 			end
 
+			@draft_mgr.stub!(:get_attribute).and_return("title")
+
 			@manager.load_config
 			@manager.start
-			@manager.stub!(:system).and_return(nil)
 
 			system "touch #{@manager.draft_dir}/draft5.67"
+
+			@manager.stub!(:system).and_return(true)
 		end
 
 		it "should send the proper command" do
-			@manager.should_receive(:system).with("blux --convert -f draft5.67 | blux_wp_publish -t no title --config #{@blux_rc} | blux --set_edit_url -f draft5.67")
+			@manager.should_receive(:system).with("blux --convert -f draft5.67 | ruby #{File.dirname(__FILE__)[0..-6]}/lib/wp_publish.rb -t title --config #{@blux_rc} | blux --set_edit_url -f draft5.67")
 			@manager.publish 'draft5.67'
 		end
 
 		it "should send the command with the title included if it exists" do
 			@draft_mgr.stub!(:get_attribute).and_return('bla')
 
-			@manager.should_receive(:system).with("blux --convert -f draft5.67 | blux_wp_publish -t bla --config #{@blux_rc} | blux --set_edit_url -f draft5.67")
+			@manager.should_receive(:system).with("blux --convert -f draft5.67 | ruby #{File.dirname(__FILE__)[0..-6]}/lib/wp_publish.rb -t bla --config #{@blux_rc} | blux --set_edit_url -f draft5.67")
 			@manager.publish 'draft5.67'
 		end
 
@@ -145,6 +149,11 @@ describe BlogManager do
 		File.open(@blux_rc, 'w') do |f|
 			f.puts "editor: gedit"
 			f.puts "html_converter: blux_textile_to_html"
+
+			f.puts "blog: louis"
+			f.puts "author_name: louis"
+			f.puts "user_name: louis"
+			f.puts "password: password"
 		end
 	end
 end

data/spec/blux_config_reader_spec.rb

@@ -22,10 +22,6 @@ describe BluxConfigurationReader do
 			@reader.launch_editor_cmd.should == 'gedit'
 		end
 
-		it "should read the html_converter from the config file" do
-			@reader.html_converter_cmd.should == 'ruby textile_to_html.rb'
-		end
-
 		it "should read the blog from the config file" do
 			@reader.blog.should == 'myownblog'
 		end
@@ -43,23 +39,55 @@ describe BluxConfigurationReader do
 		end
 	end
 
-	context "loading the editor from the config file when it doesn't exist" do
+	context "loading the config with missing items" do
 		before :each do
 			@blux_rc = "#{File.dirname(__FILE__)}/.bluxrc"
+			@reader = BluxConfigurationReader.new
+		end
+
+		it "should raise an exception when the editor is missing" do
 			create_empty_config
+			lambda {@reader.load_config @blux_rc}.should raise_error("please specify an editor in .bluxrc:\n  editor: [your editor of choice]")
+		end
 
-			@reader = BluxConfigurationReader.new
-			@reader.load_config @blux_rc
+		it "should raise an exception when the blog name is missing" do
+			lines = ["editor: gedit",
+					 "author_name: Author Bob",
+					 "user_name: this_user",
+					 "password: pass123"]
+			
+			create_config_with lines
+			lambda {@reader.load_config @blux_rc}.should raise_error("please specify your wordpress blog name in .bluxrc:\n  blog: [your blog]")
 		end
 
-		it "should show a warning" do
-			STDERR.should_receive(:puts).with("please specify an editor in .bluxrc: editor: [your editor of choice]\n")
-			STDERR.should_receive(:puts).with("please specify an html converter in .bluxrc: html_converter: [your converter command of choice]\n")
-			STDERR.should_receive(:puts).with("please specify your wordpress blog name in .bluxrc: blog: [your blog]\n")
-			STDERR.should_receive(:puts).with("please specify an author name in .bluxrc: author_name: [your name]\n")
-			STDERR.should_receive(:puts).with("please specify your wordpress user name in .bluxrc: user_name: [your user name]\n")
-			STDERR.should_receive(:puts).with("please specify your wordpress password in .bluxrc: password: [your password]\n")
-			@reader.load_config @blux_rc
+		it "should raise an exception when the author name is missing" do
+			lines = ["editor: gedit",
+					 "blog: myownblog",
+					 "user_name: this_user",
+					 "password: pass123"]
+			
+			create_config_with lines
+			lambda {@reader.load_config @blux_rc}.should raise_error("please specify an author name in .bluxrc:\n  author_name: [your name]")
+		end
+
+		it "should raise an exception when the user name is missing" do
+			lines = ["editor: gedit",
+					 "blog: myownblog",
+					 "author_name: Author Bob",
+					 "password: pass123"]
+
+			create_config_with lines
+			lambda {@reader.load_config @blux_rc}.should raise_error("please specify your wordpress user name in .bluxrc:\n  user_name: [your user name]")
+		end
+
+		it "should raise an exception when the password is missing" do
+			lines = ["editor: gedit",
+					 "blog: myownblog",
+					 "author_name: Author Bob",
+					 "user_name: this_user"]
+
+			create_config_with lines
+			lambda {@reader.load_config @blux_rc}.should raise_error("please specify your wordpress password in .bluxrc:\n  password: [your password]")
 		end
 	end
 
@@ -68,6 +96,12 @@ describe BluxConfigurationReader do
 		end
 	end
 
+	def create_config_with(lines)
+		File.open(@blux_rc, 'w') do |f|
+			lines.each {|l| f.puts l}
+		end
+	end
+
 	def create_config
 		File.open(@blux_rc, 'w') do |f|
 			f.puts "editor: gedit"

data/spec/draft_manager_spec.rb

@@ -10,7 +10,7 @@ describe DraftManager do
 		Dir.mkdir(@blux_dir) unless Dir.exists?(@blux_dir)
 		Dir.mkdir(@temp_dir) unless Dir.exists?(@temp_dir)
 		Dir.mkdir(@draft_dir) unless Dir.exists?(@draft_dir)
-		
+
 		def STDERR.puts(str) end
 		@manager = DraftManager.new()
 		@manager.setup('gedit', @temp_dir, @draft_dir)
@@ -47,7 +47,7 @@ describe DraftManager do
 
 	context "when creating a new draft" do
 		before :each do
-			@manager.stub!(:system).and_return(nil)
+			@manager.stub!(:system).and_return(true)
 		end
 
 		after :each do
@@ -91,7 +91,7 @@ describe DraftManager do
 
 	context "when saving a new draft" do
 		before :each do
-			@manager.stub!(:system).and_return(nil)
+			@manager.stub!(:system).and_return(true)
 
 			class Tempfile
 				def size() 123 end
@@ -123,7 +123,7 @@ describe DraftManager do
 
 			@manager = DraftManager.new
 			@manager.setup('gedit', @temp_dir, @draft_dir)
-			@manager.stub!(:system).and_return(nil)
+			@manager.stub!(:system).and_return(true)
 		end
 
 		it "should call the editor command" do
@@ -134,8 +134,7 @@ describe DraftManager do
 		end
 
 		it "should show an error if the file doesn't exist" do
-			STDERR.should_receive(:puts).with("draft filename asdf.asf does not exist\n")
-			@manager.edit_draft('asdf.asf')
+			lambda {@manager.edit_draft('asdf.asf')}.should raise_error("draft filename asdf.asf does not exist")
 		end
 
 		it "should add the edited time to the attributes of that draft" do
@@ -177,8 +176,7 @@ describe DraftManager do
 		end
 
 		it "should output an error message if the file does not exist" do
-			STDERR.should_receive(:puts).with("draft filename asdf.asf does not exist\n")
-			@manager.edit_draft('asdf.asf')
+			lambda {@manager.edit_draft('asdf.asf')}.should raise_error("draft filename asdf.asf does not exist")
 		end
 	end
 
@@ -255,8 +253,7 @@ describe DraftManager do
 		end
 
 		it "should output an error message if the file does not exist" do
-			STDERR.should_receive(:puts).with("draft filename asdf.asf does not exist\n")
-			@manager.set_attribute('asdf.asf', "attr", "456")
+			lambda {@manager.set_attribute('asdf.asf', "attr", "456")}.should raise_error("draft filename asdf.asf does not exist")
 		end
 
 		it "should save the draft index to disk" do
@@ -277,19 +274,19 @@ describe DraftManager do
 			@manager.setup('gedit', @temp_dir, @draft_dir)
 		end
 
-		it "should output an error message if the title is not unique" do
+		it "should output an warning message if the title is not unique" do
 			@manager.set_attribute('draft.1', "title", 'title')
 
-			STDERR.should_receive(:puts).with("title 'title' is not unique\n")
+			STDERR.should_receive(:<<).with("warning: title 'title' is not unique\n")
 			@manager.set_attribute('draft.2', "title", 'title')
 		end
 
-		it "should not change the value of the previous title" do
+		it "should still change the value of the previous title" do
 			@manager.set_attribute('draft.1', 'title', 'title')
 			@manager.set_attribute('draft.2', 'title', 'title2')
 			@manager.set_attribute('draft.2', 'title', 'title')
 
-			@manager.index['draft.2']["title"].should == 'title2'
+			@manager.index['draft.2']["title"].should == 'title'
 		end
 	end
 
@@ -310,8 +307,7 @@ describe DraftManager do
 		end
 
 		it "should output an error message if the file does not exist" do
-			STDERR.should_receive(:puts).with("draft filename asdf.asf does not exist\n")
-			@manager.delete_attribute('asdf.asf', :attr)
+			lambda {@manager.delete_attribute('asdf.asf', :attr)}.should raise_error("draft filename asdf.asf does not exist")
 		end
 
 		it "should save the draft index to disk" do
@@ -335,8 +331,7 @@ describe DraftManager do
 		end
 
 		it "should output an error message if there are no drafts saved" do
-			STDERR.should_receive(:puts).with("there is currently no saved index\n")
-			@manager.get_latest_created_draft
+			lambda {@manager.get_latest_created_draft}.should raise_error("there is currently no saved index")
 		end
 	end
 
@@ -355,8 +350,7 @@ describe DraftManager do
 		end
 
 		it "should output an error message if there are no drafts saved" do
-			STDERR.should_receive(:puts).with("there is currently no saved index\n")
-			@manager.get_draft_by_title("title2")
+			lambda {@manager.get_draft_by_title("title2")}.should raise_error("there is currently no saved index")
 		end
 	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Louis Salin
@@ -35,7 +35,7 @@ cert_chain:
   1GuoIVBODMvF3w==
   -----END CERTIFICATE-----
 
-date: 2010-10-10 00:00:00 -05:00
+date: 2010-10-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,16 +162,14 @@ description: An offline blog manager
 email: louis.phil@gmail.com
 executables: 
 - blux
-- blux_textile_to_html
-- blux_wp_publish
 extensions: []
 
 extra_rdoc_files: 
 - COPYING
 - README.markdown
 - bin/blux
-- bin/blux_textile_to_html
-- bin/blux_wp_publish
+- lib/textile_to_html.rb
+- lib/wp_publish.rb
 - lib/blog_manager.rb
 - lib/blux_config_reader.rb
 - lib/blux_option_parser.rb
@@ -183,8 +181,8 @@ files:
 - README.markdown
 - Rakefile
 - bin/blux
-- bin/blux_textile_to_html
-- bin/blux_wp_publish
+- lib/textile_to_html.rb
+- lib/wp_publish.rb
 - lib/blog_manager.rb
 - lib/blux_config_reader.rb
 - lib/blux_option_parser.rb