pit 0.0.5 → 0.0.6

data/ChangeLog

@@ -1,3 +1,13 @@
+2008-07-15  SATOH Hiroh <cho45@lowreal.net>
+
+	* [release]:
+		Released 0.05
+
+2008-01-09  SATOH Hiroh <cho45@lowreal.net>
+
+	* [change]:
+		Switch returns previous value
+
 2008-01-06  cho45
 
 	* [r4144] lib/pit.rb:

data/README

@@ -49,8 +49,11 @@ ruby lib.
 		"nickname" => "default value"
 	})
 
+Pit.get open $EDITOR with `require` hash if the setting does not have
+required keys.
+
 == Copyright
 
 Author::    cho45 <cho45@lowreal.net>
 Copyright:: Copyright (c) 2008 cho45
-License::   Creative Commons by
+License::   Ruby's

data/Rakefile

@@ -118,16 +118,11 @@ Rake::ShipitTask.new do |s|
 		system("svn", "up")
 	}.and {}
 	s.Task :rubyforge
-	s.Step.new {
-		raise "svn2cl.sh is not found" unless system("svn2cl.sh", "--version")
-	}.and {
-		system("svn2cl.sh --break-before-msg=2 --group-by-day  --include-rev --separate-daylogs")
-	}
 	s.ChangeVersion "lib/pit.rb", "VERSION"
 	s.Commit
 	s.Task :clean, :package
 	s.RubyForge
-#	s.Tag
+	s.Tag
 	s.Twitter
 end
 

data/lib/pit.rb

@@ -4,16 +4,24 @@ require "pathname"
 require "tempfile"
 
 module Pit
-	VERSION   = "0.0.5"
+	VERSION   = "0.0.6"
 	Directory = Pathname.new("~/.pit").expand_path
 	@@config  = Directory + "pit.yaml"
 	@@profile = Directory + "default.yaml"
 
+	# Set _name_ setting to current profile.
+	# If not _opts_ specified, this opens $EDITOR with current profile setting.
+	# If `data` specified, this just sets it to current profile.
+	# If `config` specified, this opens $EDITOR with merged hash with specified hash and
+	# current profile.
 	def self.set(name, opts={})
 		profile = self.load
 		if opts.key?(:data)
 			result = opts[:data]
 		else
+			if ENV["EDITOR"].nil? || !$stdout.tty?
+				return {}
+			end
 			c = (opts[:config] || self.get(name)).to_yaml
 			t = Tempfile.new("pit")
 			t << c
@@ -32,6 +40,9 @@ module Pit
 		result
 	end
 
+	# Get _name_ setting from current profile.
+	# If not _opts_ specified, this just returns setting from current profile.
+	# If _require_ specified, check keys on setting and open $EDITOR.
 	def self.get(name, opts={})
 		ret = self.load[name] || {}
 		if opts[:require]
@@ -43,15 +54,21 @@ module Pit
 		ret || {"username"=>"", "password"=>""}
 	end
 
+	# Switch to current profile to _name_.
+	# Profile is set of settings. You can switch some settings using profile.
 	def self.switch(name, opts={})
 		@@profile = Directory + "#{name}.yaml"
 		config = self.config
+		ret = config["profile"]
 		config["profile"] = name
 		@@config.open("w") {|f| f << config.to_yaml }
+		ret
 	end
 
+	protected
 	def self.load
 		Directory.mkpath unless Directory.exist?
+		Directory.chmod 0700
 		unless @@config.exist?
 			@@config.open("w") {|f| f << {"profile"=>"default"}.to_yaml }
 			@@config.chmod(0600)

data/test/pit_test.rb

@@ -5,8 +5,7 @@ class Pathname
 	@@tempname_number = 0
 	def self.tempname(base=$0, dir=Dir.tmpdir)
 		@@tempname_number += 1
-		name = "#{dir}/#{base}.#{$$}.#{@@tempname_number}"
-		path = new(name)
+		path = new(dir) + "#{File.basename(base)}.#{$$}.#{@@tempname_number}"
 		at_exit do
 			path.rmtree if path.exist?
 		end
@@ -42,13 +41,64 @@ class PitTest < Test::Unit::TestCase
 		assert_equal "foo", Pit.set("test", :data => {"username"=>"foo","password"=>"bar"})["username"]
 	end
 
+	def test_editor
+		ENV["EDITOR"] = nil
+		assert_nothing_raised("When editor is not set.") do
+			Pit.set("test")
+		end
+
+		tst = Pathname.tempname
+		exe = Pathname.tempname
+		exe.open("w") do |f|
+			f.puts <<-EOF.gsub(/^\t+/, "")
+				#!/usr/bin/env ruby
+
+				File.open(ENV["TEST_FILE"], "w") do |f|
+					f.puts ARGF.read
+				end
+			EOF
+		end
+		exe.chmod(0700)
+
+		ENV["TEST_FILE"] = tst.to_s
+		ENV["EDITOR"]    = exe.to_s
+		Pit.set("test")
+
+		assert_nothing_raised do
+			assert_equal({}, YAML.load_file(tst.to_s))
+		end
+
+		data = {
+			"foo" => "0101",
+			"bar" => "0202",
+		}
+
+		Pit.set("test", :data => data)
+		Pit.set("test")
+
+		assert_nothing_raised do
+			assert_equal(data, YAML.load_file(tst.to_s))
+		end
+
+		# clear
+		Pit.set("test", :data => {})
+		tst.open("w") {|f| }
+
+		Pit.get("test", :require => data)
+
+		assert_nothing_raised do
+			assert_equal(data, YAML.load_file(tst.to_s))
+		end
+	end
+
 	def test_switch
 		Pit.switch("default")
 		Pit.set("test", :data => {"username"=>"foo","password"=>"bar"})
 		assert_equal "foo", Pit.get("test")["username"]
 		assert_equal "bar", Pit.get("test")["password"]
 
-		Pit.switch("profile2")
+		r = Pit.switch("profile2")
+		assert_equal "default", r
 		assert_equal "profile2", Pit.config["profile"]
 		Pit.set("test", :data => {"username"=>"foo2","password"=>"bar2"})
 		assert_equal "foo2", Pit.get("test")["username"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pit
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - cho45
@@ -9,7 +9,7 @@ autorequire: pit
 bindir: bin
 cert_chain: []
 
-date: 2008-01-07 00:00:00 +09:00
+date: 2008-07-15 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lowreal
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: "pit: account management tool"