pitcgi 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cba141a31259b063bb9fed2dcf9d0238fd03b80
-  data.tar.gz: 8cdd6b826ce45ee0d54f649df472d7777f7660e5
+  metadata.gz: d7b37c7cc8dd2c2bfd1a7d5e470e230be23bc659
+  data.tar.gz: fb7287af965c1230632784218d4a8b60cdbc8bc3
 SHA512:
-  metadata.gz: 4fd62cf6fcc9e15ff7c0677220b9d6ce177b7214bc7d8b2b399e42a18c1b6b5fc32d16a26ba781e7c9a63eeedceabacffaff361c0511d8ccf02c1ad3a56d2a7c
-  data.tar.gz: f69f1834ca502bfa9ab2e474394c5cdfbc85e3aeb40de2501fb4d838b51e322b0a6337c69af6ccaadccf10a9314d784f580ebce0510e594fa0b5d5b8a356fe00
+  metadata.gz: 616943693dca028505dc31b9b8caff623921cdc80b55539d24b830ade8ea2a75dd022fed38f856963ea9f60e43d2bc8a80a5e6b8e0ceedfab25021542309af03
+  data.tar.gz: 5429aedb0c2fe688f8549121546f2f31ee369a9bd1cea79f159b2646bd7f6cd5a14a3ba835457ab8ac1c702076bf16eeff6d62f067b4e753bafa52f929b2e5c8

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.swp
+.ruby-version
+

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+### 0.1.0 / 2015-02-23  sanadan <jecy00@gmail.com>
+
+  * Enhance error messages
+  * Add scramble and descramble commands
+
+
+### 0.0.3 / 2015-01-28  sanadan <jecy00@gmail.com>
+
+  * Add init command
+
+
+### 0.0.2 / 2015-01-13  sanadan <jecy00@gmail.com>
+
+  * Fixed error using value "false"
+
+
+### 0.0.1 / 2014-12-18  sanadan <jecy00@gmail.com>
+
+  * Change pit 0.0.7 for cgi only.
+  * Rename to pitcgi.
+

data/Gemfile

@@ -3,6 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in text_bracket_expander.gemspec
 gemspec
 
-gem 'rake'
-gem 'test-unit'
-

data/README.md

@@ -48,14 +48,14 @@ ruby lib.
 require "pitcgi"
 
 config = Pitcgi.get("twitter.com", :require => {
-  "username" => "default value",
-  "password" => "default value"
+  "username" => "Number, mail address or username",
+  "password" => "Password"
 })
 
 Pitcgi.get("vox.com", :require => {
-  "username" => "default value",
-  "password" => "default value"
-  "nickname" => "default value"
+  "username" => "Username",
+  "password" => "Password"
+  "nickname" => "Nickname"
 })
 ```
 Pitcgi.get open $EDITOR with `require` hash if the setting does not have
@@ -65,11 +65,15 @@ required keys.
 ## Copyright
 
 Author:
+
 * sanadan <jecy00@gmail.com>
 
 Copyright:
+
 * Copyright (c) 2008 cho45
-* Copyright (c) 2014 sanadan
+* Copyright (c) 2014-2015 sanadan
 
 License:
+
 * Ruby's
+

data/Rakefile

@@ -7,3 +7,6 @@ Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']
 end
+
+task :default => [ :install, :test ]
+

data/bin/pitcgi

@@ -57,6 +57,22 @@ class PitcgiCommand
 					Initialize #{NAME} environment.
 				EOB
 			},
+
+			"scramble" => OptionParser.new { |opts|
+				opts.banner = <<-EOB.gsub(/^\t+/, "")
+					Usage: #{NAME} scramble
+
+					Enable scramble mode.
+				EOB
+			},
+
+			"descramble" => OptionParser.new { |opts|
+				opts.banner = <<-EOB.gsub(/^\t+/, "")
+					Usage: #{NAME} descramble
+
+					Disable scramble mode.
+				EOB
+			},
 		}
 
 		@parser = OptionParser.new do |parser|
@@ -92,7 +108,11 @@ class PitcgiCommand
 			method_name = "cmd_#{@subcommand}"
 			if self.respond_to?(method_name)
 				@subparsers[@subcommand].parse!(@argv)
-				self.send(method_name)
+				begin
+          self.send(method_name)
+        rescue Errno::EACCES
+          warn( $! )
+        end
 			else
 				puts "Not implemented subcommand: `#{@subcommand}'."
 				puts
@@ -103,9 +123,12 @@ class PitcgiCommand
 
 	def cmd_get
 		name, = @argv
-		exit if name.nil?
+		if name.nil?
+      warn( '<name> is not specified.' )
+      exit
+    end
 		if $stdout.tty?
-			warn "do not output to tty."
+			warn "Do not output to tty."
 		else
 			puts Pitcgi.get(name).to_yaml
 		end
@@ -113,16 +136,24 @@ class PitcgiCommand
 
 	def cmd_set
 		name, = @argv
-		exit if name.nil?
-		Pitcgi.set(name)
+		if name.nil?
+      warn( '<name> is not specified.' )
+      exit
+    end
+    Pitcgi.set(name)
 	end
 
 	def cmd_switch
 		profile, = @argv
 		profile = "default" if profile.nil?
 		profile.gsub(/[^a-z0-9.-]/i, "")
-		Pitcgi.switch(profile)
-		warn "Switch profile to #{profile}"
+		begin
+      Pitcgi.switch( profile )
+    rescue
+      warn( $! )
+      exit
+    end
+		warn( "Switch profile to #{profile}." )
 	end
 
 	def cmd_help
@@ -131,7 +162,7 @@ class PitcgiCommand
 			if @subparsers.key? subcommand
 				puts @subparsers[subcommand].help
 			else
-				puts "No such subcommand `#{subcommand}'"
+				puts "No such subcommand `#{subcommand}'."
 				puts @parser.help
 			end
 		else
@@ -140,14 +171,36 @@ class PitcgiCommand
 	end
 
   def cmd_init
-    puts( 'Initialize environment.' )
-    system( "sudo mkdir #{Pitcgi::Directory}" )
-    system( "sudo chmod 770 #{Pitcgi::Directory}" )
-    system( "sudo chgrp www-data #{Pitcgi::Directory}" )
-    system( "sudo adduser $USER www-data" )
+    warn( 'Initialize environment.' )
+    exit unless system( "sudo -v" )
+    ws( "sudo mkdir #{Pitcgi::Directory}" )
+    ws( "sudo chmod 770 #{Pitcgi::Directory}" )
+    ws( "sudo chgrp www-data #{Pitcgi::Directory}" )
+    ws( "sudo adduser #{ENV[ 'USER' ]} www-data" )
+  end
+
+  def cmd_scramble
+    begin
+      Pitcgi.scramble
+    rescue
+      warn( $! )
+    end
+  end
+
+  def cmd_descramble
+    begin
+      Pitcgi.descramble
+    rescue
+      warn( $! )
+    end
+  end
+
+  protected
+  def ws( command )
+    warn( command )
+    system( command )
   end
 end
 
 PitcgiCommand.run(ARGV)
 
-

data/lib/pitcgi.rb

@@ -2,18 +2,22 @@ require 'pitcgi/version'
 require "yaml"
 require "pathname"
 require "tempfile"
+require 'scrambled_eggs'
 
 module Pitcgi
-  NAME = 'pitcgi'
-	Directory = Pathname.new("/etc/pitcgi").expand_path
-	@@config  = Directory + "pitcgi.yaml"
-	@@profile = Directory + "default.yaml"
+  NOT_TO_BE_INITIALIZED = "It is likely not to be initialized. Use '#{NAME} init'."
+	ALREADY_SCRAMBLED = 'Already scrambled.'
+  NOT_SCRAMBLED = 'Not scrambled.'
+  CAN_NOT_USE_PROFILE_NAME = 'Can not use it for profile name.'
+  Directory = Pathname.new("/etc/pitcgi").expand_path
+	@@config_path = Directory + "pitcgi.yaml"
+	@@profile_path = 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.
+	# 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)
@@ -36,11 +40,11 @@ module Pitcgi
 			result = YAML.load(result)
 		end
 		profile[name] = result
-		@@profile.open("w") {|f| YAML.dump(profile, f) }
-		result
+    self.save( profile )
+    result
 	end
 
-	# Get _name_ setting from current profile.
+  # 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={})
@@ -57,13 +61,53 @@ module Pitcgi
 	# 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"]
+		@@profile_path = Directory + "#{name}.yaml"
+    if @@profile_path == @@config_path
+      raise( CAN_NOT_USE_PROFILE_NAME )
+    end
+		begin
+      config = self.load_config
+      ret = config["profile"]
+    rescue Errno::ENOENT
+      config = {}
+      ret = ""
+    end
 		config["profile"] = name
-		@@config.open("w") {|f| f << config.to_yaml }
-		ret
+		begin
+      self.save_config( config )
+    rescue Errno::ENOENT => e
+      raise e, NOT_TO_BE_INITIALIZED
+    end
+    ret
 	end
+ 
+  # Scramble profile.
+  def self.scramble
+    config = self.load_config
+    config_scrambled = self.get_profile_config( config )
+    if config_scrambled[ 'scrambled' ]
+      raise( ALREADY_SCRAMBLED )
+    end
+    ScrambledEggs.new.scramble_file( @@profile_path )
+    config_scrambled[ 'scrambled' ] = true
+    config[ get_profile_config_name( config ) ] = config_scrambled
+    self.save_config( config )
+    return
+  end
+
+  # Descramble profile.
+  def self.descramble
+    config = self.load_config
+    config_scrambled = self.get_profile_config( config )
+    if !config_scrambled[ 'scrambled' ]
+      raise( NOT_SCRAMBLED )
+    end
+    ScrambledEggs.new.descramble_file( @@profile_path )
+    config_scrambled[ 'scrambled' ] = false
+    config[ get_profile_config_name( config ) ] = config_scrambled
+    self.save_config( config )
+    return
+  end
 
 	protected
 	def self.load
@@ -73,34 +117,57 @@ module Pitcgi
 		    Directory.chmod 0770
         Directory.chown(nil, 33)  # www-data
       rescue Errno::EACCES => e
-        raise e, "May not be initialized. Use '#{NAME} init'."
+        raise e, NOT_TO_BE_INITIALIZED
       end
     end
-		unless @@config.exist?
-			@@config.open("w") {|f| f << {"profile"=>"default"}.to_yaml }
-			@@config.chmod(0660)
-      @@config.chown(nil, 33)  # www-data
-		end
-		self.switch(self.config["profile"])
-		unless @@profile.exist?
-			@@profile.open("w") {|f| f << {}.to_yaml }
-			@@profile.chmod(0660)
-      @@profile.chown(nil, 33)  # www-data
+		unless @@config_path.exist?
+			@@config_path.open("w") {|f| f << {"profile"=>"default"}.to_yaml }
+			@@config_path.chmod(0660)
+      @@config_path.chown(nil, 33)  # www-data
+    end
+    config = self.load_config
+		self.switch( config[ 'profile' ] )
+		unless @@profile_path.exist?
+			@@profile_path.open("w") {|f| f << {}.to_yaml }
+			@@profile_path.chmod(0660)
+      @@profile_path.chown(nil, 33)  # www-data
 		end
-		YAML.load(@@profile.read) || {}
+    data = @@profile_path.binread
+    if self.get_profile_config( config )[ 'scrambled' ]
+      data = ScrambledEggs.new.descramble( data )
+    end
+		YAML.load( data ) || {}
 	end
 
-	def self.config
-		YAML.load(@@config.read)
-	end
-end
+  def self.save( profile )
+    data = profile.to_yaml
+    config = self.load_config
+    self.switch( config[ 'profile' ] )
+    if self.get_profile_config( config )[ 'scrambled' ]
+      data = ScrambledEggs.new.scramble( data )
+    end
+		# Not exist Pathname#write on Ruby 2.0.0.
+    #@@profile.binwrite( data )
+    IO.binwrite( @@profile_path, data )
+  end
 
+  def self.load_config
+    YAML.load( @@config_path.read )
+  end
 
-__END__
-p Pitcgi.set("test")
-p Pitcgi.get("test")
+  def self.save_config( config )
+    # Not exist Pathname#write on Ruby 2.0.0.
+    #@@config.write( config.to_yaml )
+    IO.write( @@config_path, config.to_yaml )
+  end
 
-config = Pitcgi.get("twitter")
-p config["password"]
-p config["username"]
+  def self.get_profile_config( config )
+    name = get_profile_config_name( config )
+    return config[ name ] ? config[ name ] : {}
+  end
+  
+  def self.get_profile_config_name( config )
+    return config[ 'profile' ] + '_config'
+  end
+end
 

data/lib/pitcgi/version.rb

@@ -1,4 +1,5 @@
 
 module Pitcgi
-  VERSION = '0.0.3'
+  NAME = 'pitcgi'
+  VERSION = '0.1.0'
 end

data/pitcgi.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pitcgi/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "pitcgi"
+  gem.name          = Pitcgi::NAME
   gem.version       = Pitcgi::VERSION
   gem.authors       = ["sanadan"]
   gem.licenses      = ['Ruby']
@@ -17,4 +17,10 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.required_ruby_version = '>= 2.0.0'
+  gem.add_development_dependency( 'rake' )
+  gem.add_development_dependency( 'test-unit' )
+  gem.add_dependency( 'scrambled_eggs' )
 end
+

data/test/pitcgi_test.rb

@@ -17,22 +17,23 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 require "test/unit"
 ORG_DIR = Pitcgi::Directory.to_s.sub( /\/$/, '' ) + '.org'
 
+def ps( command = nil )
+  puts( command )
+  system( command ) if command
+end
+
 class PitcgiTest < Test::Unit::TestCase
-  class << self
-    def ps( command )
-      puts( command )
-      system( command )
-    end
+  self.test_order = :defined
 
+  class << self
     def startup
       # Rename /etc/pitcgi if exist
       ps( "sudo mv #{Pitcgi::Directory} #{ORG_DIR}" )
-      ps( "pitcgi init" )
     end
 
     def shutdown
       # Rename /etc/pitcgi.org if exist
-      puts
+      ps()
       ps( "sudo rm -rf #{Pitcgi::Directory}" )
       ps( "sudo mv #{ORG_DIR} #{Pitcgi::Directory}" )
     end
@@ -43,6 +44,8 @@ class PitcgiTest < Test::Unit::TestCase
 	end
 
 	def test_set_get
+    ps( "pitcgi init" )
+
 		Pitcgi.set("test", :data => {"username"=>"foo","password"=>"bar"})
 		assert_equal "foo", Pitcgi.get("test")["username"]
 		assert_equal "bar", Pitcgi.get("test")["password"]
@@ -75,7 +78,7 @@ class PitcgiTest < Test::Unit::TestCase
 		tst = Pathname.tempname
 		exe = Pathname.tempname
 		exe.open("w") do |f|
-			f.puts <<-EOF.gsub(/^\t+/, "")
+			f.puts <<-EOF.gsub(/^[\t ]+/, "")
 				#!/usr/bin/env ruby
 
 				File.open(ENV["TEST_FILE"], "w") do |f|
@@ -124,14 +127,16 @@ class PitcgiTest < Test::Unit::TestCase
 
 		r = Pitcgi.switch("profile2")
 		assert_equal "default", r
-		assert_equal "profile2", Pitcgi.config["profile"]
+		assert_equal( "profile2", Pitcgi.load_config[ "profile" ] )
 		Pitcgi.set("test", :data => {"username"=>"foo2","password"=>"bar2"})
 		assert_equal "foo2", Pitcgi.get("test")["username"]
 		assert_equal "bar2", Pitcgi.get("test")["password"]
 
-    # Clear
-		Pitcgi.set("test", :data => {})
-    
+    assert_raise do
+      Pitcgi.switch( 'pitcgi' )
+    end
+    assert_equal( 'foo2', Pitcgi.get( 'test' )[ 'username' ] )
+
 		Pitcgi.switch("default")
 		Pitcgi.set("test", :data => {"username"=>"foo6","password"=>"bar6"})
 		assert_equal "foo6", Pitcgi.get("test")["username"]
@@ -140,4 +145,60 @@ class PitcgiTest < Test::Unit::TestCase
 		# Clear
     Pitcgi.set("test", :data => {})
 	end
+
+  def test_scramble
+    Pitcgi.set( 'test', :data => { 'username' => 'foo7', 'password' => 'bar7' } )
+    path = Pathname( '/etc/pitcgi/default.yaml' )
+    src = path.binread
+    Pitcgi.scramble
+    scrambled = path.binread
+    assert_not_equal( src, scrambled )
+    assert_raise do
+      Pitcgi.scramble
+    end
+    Pitcgi.descramble
+    descrambled = path.binread
+    assert_equal( src, descrambled )
+    assert_raise do
+      Pitcgi.descramble
+    end
+  end
+
+  def test_access_scrambled
+    username = 'foo8'
+    password = 'bar8'
+    Pitcgi.set( 'test', :data => { 'username' => username, 'password' => password } )
+    Pitcgi.scramble
+    assert_equal( Pitcgi.get( 'test' )[ 'username' ], username )
+    assert_equal( Pitcgi.get( 'test' )[ 'password' ], password )
+    Pitcgi.descramble
+  end
+
+  def test_access_mix_scrambled
+    username = 'foo9'
+    password = 'bar9'
+    Pitcgi.set( 'test', :data => { 'username' => username, 'password' => password } )
+    Pitcgi.scramble
+    Pitcgi.switch( 'profile2' )
+    username2 = 'foo10'
+    password2 = 'bar10'
+    Pitcgi.set( 'test2', :data => { 'username2' => username2, 'password2' => password2 } )
+
+    Pitcgi.switch( 'default' )
+    assert_equal( Pitcgi.get( 'test' )[ 'username' ], username )
+    assert_equal( Pitcgi.get( 'test' )[ 'password' ], password )
+
+    Pitcgi.switch( 'profile2' )
+    assert_equal( Pitcgi.get( 'test2' )[ 'username2' ], username2 )
+    assert_equal( Pitcgi.get( 'test2' )[ 'password2' ], password2 )
+    Pitcgi.scramble
+    assert_equal( Pitcgi.get( 'test2' )[ 'username2' ], username2 )
+    assert_equal( Pitcgi.get( 'test2' )[ 'password2' ], password2 )
+
+    Pitcgi.switch( 'default' )
+    Pitcgi.descramble
+    assert_equal( Pitcgi.get( 'test' )[ 'username' ], username )
+    assert_equal( Pitcgi.get( 'test' )[ 'password' ], password )
+  end
 end
+

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: pitcgi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - sanadan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
-dependencies: []
+date: 2015-02-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: scrambled_eggs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'pitcgi: account management tool for cgi'
 email:
 - jecy00@gmail.com
@@ -18,8 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ChangeLog
+- .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -39,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: 'pitcgi: account management tool for cgi'

data/ChangeLog

@@ -1,15 +0,0 @@
-2015-01-28	sanadan <jecy00@gmail.com>
-
-	*	Add init command
-
-
-2015-01-13	sanadan <jecy00@gmail.com>
-
-	*	Fixed error using value "false"
-
-
-2014-12-18	sanadan <jecy00@gmail.com>
-
-	*	Change pit 0.0.7 for cgi only.
-	*	Rename to pitcgi.
-