to_pass 0.9.0 → 1.0.0

data/test/fixtures/user_config

@@ -0,0 +1,3 @@
+algorithm: user_alg
+pipe_out: false
+pipe_in: false

data/test/helper.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 require 'mocha'
 require 'rbconfig'
 require 'pathname'
+require 'fileutils'
 
 # optional libraries
 begin
@@ -46,23 +47,73 @@ Test::Unit::TestCase.class_eval do
 
   def standard_directories
     dirs = []
-    dirs << Pathname.new('~/.to_pass').expand_path # user
+    dirs << Pathname.new("#{user_dir}").expand_path # user
     dirs << "#{ruby_data_dir}/#{ToPass::APP_NAME}" # installed
     dirs << "#{File.dirname(__FILE__)}/../data/#{ToPass::APP_NAME}" if in_to_pass_soure_tree? # source [in github]
 
     dirs
   end
 
-  def with_algorithm_in_user_dir
-    `mkdir -p ~/.to_pass/algorithms; cp -f #{File.dirname(__FILE__)}/fixtures/user_alg.yml ~/.to_pass/algorithms/user_alg.yml`
-    yield
-    `rm ~/.to_pass/algorithms/user_alg.yml`
+  def with_algorithm_in_user_dir(dir = "#{user_dir}/algorithms")
+    with_dir(dir) do
+      safe_copy(
+        "#{File.dirname(__FILE__)}/fixtures/user_alg.yml",
+        "#{dir}/user_alg.yml",
+        &Proc.new
+      )
+    end
   end
-
   def with_converters_in_user_dir
-    `mkdir -p ~/.to_pass/converters; cp -f #{File.dirname(__FILE__)}/fixtures/user_converter.rb ~/.to_pass/converters/userize.rb`
-    yield
-    `rm ~/.to_pass/converters/userize.rb`
+    with_dir("#{user_dir}/converters") do
+      safe_copy(
+        "#{File.dirname(__FILE__)}/fixtures/user_converter.rb",
+        "#{user_dir}/converters/userize.rb",
+        &Proc.new
+      )
+    end
+  end
+  def with_config_in_user_dir
+    with_dir("#{user_dir}") do
+      safe_copy(
+        "#{File.dirname(__FILE__)}/fixtures/user_config",
+        "#{user_dir}/config",
+        &Proc.new
+      )
+    end
+  end
+  def without_config_user_dir
+    with_dir("#{user_dir}") do
+      safe_copy(
+        nil,
+        "#{user_dir}/config",
+        &Proc.new
+      )
+    end
+  end
+
+  def with_dir(dir)
+    FileUtils.mkpath("#{dir}")
+
+    result = yield
+
+    Dir.rmdir("#{dir}") if ( Dir.entries("#{dir}") == ['.', '..'] )
+
+    result
+  end
+  def safe_copy(source, target)
+    begin
+      target = File.expand_path(target)
+      backup = "#{target}.backup"
+
+      FileUtils.mv(target, backup) if File.exists?(target)
+      FileUtils.cp(source, target) unless source.nil?
+
+      yield
+
+      FileUtils.rm(target) unless source.nil?
+    ensure
+      FileUtils.mv(backup, target) if File.exists?(backup)
+    end
   end
 
   def in_to_pass_soure_tree?
@@ -72,6 +123,10 @@ Test::Unit::TestCase.class_eval do
   def ruby_data_dir
     RbConfig::CONFIG['data-dir'] || RbConfig::CONFIG['datadir']
   end
+
+  def user_dir
+    ToPass::Directories[:user]
+  end
 end
 
 unless Pathname.new("#{File.dirname(__FILE__)}/../to_pass.gemspec").expand_path.exist?

data/test/test_base.rb

@@ -12,6 +12,14 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
+  def test_options
+    with_dir('/tmp/my_to_pass') do
+      with_algorithm_in_user_dir('/tmp/my_to_pass/algorithms') do
+        assert_equal 'te/t', ToPass::Base.new('test', :user_alg, :path => Pathname.new('/tmp/my_to_pass').expand_path).to_s
+      end
+    end
+  end
+
   def test_version
     assert_match /\d+.\d+.\d+/, ToPass::VERSION
   end
@@ -36,23 +44,6 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
-  def test_directories
-    dirs = ToPass::Directories
-
-    assert defined?(dirs)
-    assert_respond_to dirs, :[]
-
-    assert_equal '~/.to_pass', dirs[:user]
-    assert_equal "#{ruby_data_dir}/#{ToPass::APP_NAME}", dirs[:data]
-
-    if in_to_pass_soure_tree?
-      assert_equal Pathname.new("#{File.dirname(__FILE__)}/../").expand_path.to_s, dirs[:base]
-      assert_equal Pathname.new("#{File.dirname(__FILE__)}/../data/#{ToPass::APP_NAME}").expand_path.to_s, dirs[:source_data]
-    end
-
-    assert_equal [ dirs[:user], dirs[:data], dirs[:source_data] ], dirs[:standard]
-  end
-
   def test_release_notes
     fn = File.expand_path('../../doc/RELEASE_NOTES', __FILE__)
 
@@ -62,11 +53,4 @@ class TestBase < Test::Unit::TestCase
       assert_nil ToPass::RELEASE_NOTES
     end
   end
-
-  # def test_uses_to_passrc_for_configuration
-  #   assert_nothing_raised  do
-  #     # make default algorithm configurable in .to_passrc [kronn/to_pass GH-1]
-  #     fail 'this needs to be implemeted'
-  #   end
-  # end
 end

data/test/test_cli.rb

@@ -6,14 +6,18 @@ class TestCli < Test::Unit::TestCase
   test_presence ToPass::Cli
 
   def test_cli_usage_without_algorithm
-    assert_nothing_raised do
-      assert_equal "t35t", `#{binpath}to_pass test`.chomp
+    without_config_user_dir do
+      assert_nothing_raised do
+        assert_equal "$78bRkT5eT0n5Fk", `#{binpath}to_pass test`.chomp
+      end
     end
   end
 
   def test_cli_usage_with_password_of
-    assert_nothing_raised do
-      assert_equal "t35t", `#{binpath}password_of test`.chomp
+    without_config_user_dir do
+      assert_nothing_raised do
+        assert_equal "$78bRkT5eT0n5Fk", `#{binpath}password_of test`.chomp
+      end
     end
   end
 
@@ -24,20 +28,26 @@ class TestCli < Test::Unit::TestCase
   end
 
   def test_cli_usage_with_pipes
-    assert_nothing_raised do
-      assert_equal 't35t', `echo "test" | #{binpath}to_pass`
+    without_config_user_dir do
+      assert_nothing_raised do
+        assert_equal '$78bRkT5eT0n5Fk', `echo "test" | #{binpath}to_pass`
+      end
     end
   end
 
   def test_cli_usage_with_pipe_input
-    assert_nothing_raised do
-      assert_equal 't35t', `echo "test" | #{binpath}to_pass --no-pipe`.chomp
+    without_config_user_dir do
+      assert_nothing_raised do
+        assert_equal '$78bRkT5eT0n5Fk', `echo "test" | #{binpath}to_pass --no-pipe`.chomp
+      end
     end
   end
 
   def test_cli_usage_with_pipe_output
-    assert_nothing_raised do
-      assert_equal 't35t', `#{binpath}to_pass test --pipe`
+    without_config_user_dir do
+      assert_nothing_raised do
+        assert_equal '$78bRkT5eT0n5Fk', `#{binpath}to_pass test --pipe`
+      end
     end
   end
 
@@ -73,24 +83,53 @@ class TestCli < Test::Unit::TestCase
     assert_match /Show this message/, result, 'should contain hint for help'
   end
 
+  def test_cli_usage_with_user_config
+    with_algorithm_in_user_dir do
+      with_config_in_user_dir do
+        assert_equal "le1/2%z", `#{binpath}to_pass 'leasbpc'`.chomp
+        assert_equal "le1/2%z", `#{binpath}to_pass 'luke eats all sausagages because peter cries'`.chomp
+      end
+    end
+  end
+
+  def test_configuration_path_is_configurable
+    FileUtils.rm_r('/tmp/my_to_pass', :force => true, :secure => true)
 
-  # def test_configuration_path_is_configurable
-  #   [
-  #     `#{binpath}to_pass test -c /tmp/my_to_pass`,
-  #     `#{binpath}to_pass test --config /tmp/my_to_pass`
-  #   ].each do |result|
-  #     assert_match /configuration path not found/, result, 'should output an errormessage'
-  #     assert_match %r!to_pass --setup --config /tmp/my_to_pass!, result, 'should provide a hint how to fix it'
-  #   end
-  # end
-
-  # def test_cli_has_setup_command
-  #   result = `#{binpath}to_pass --setup 2>&1`
-  #
-  #   assert path_not_present
-  #   assert_match /successfully created configuration paths/i, result, 'should print success message'
-  #   assert path_present
-  # end
+    [
+      `#{binpath}to_pass test -c /tmp/my_to_pass`,
+      `#{binpath}to_pass test --config /tmp/my_to_pass`
+    ].each do |result|
+      assert_match /configuration path not found/, result, 'should output an errormessage'
+      assert_match %r!to_pass --setup /tmp/my_to_pass!, result, 'should provide a hint how to fix it'
+    end
+
+    with_algorithm_in_user_dir('/tmp/my_to_pass/algorithms') do
+      assert_equal 'te/t', `#{binpath}to_pass test -c /tmp/my_to_pass -a user_alg`.chomp
+    end
+  end
+
+  def test_cli_has_setup_command
+    path = Pathname.new('/tmp/my_to_pass')
+
+    FileUtils.rm_r(path, :force => true, :secure => true)
+
+    assert !path.exist?
+
+    assert_match /successfully created configuration directory in #{path}/i,
+      `#{binpath}to_pass --setup #{path} 2>&1`,
+      'should print success message'
+
+    assert path.exist?
+  end
+
+  def test_cli_has_setup_command_with_default
+    with_config_in_user_dir do
+      dir = Pathname.new(user_dir).expand_path
+      result = `#{binpath}to_pass --setup 2>&1`
+      assert_match /configuration in #{dir} not overwritten/, result
+      assert_match /successfully created configuration directory in #{dir}/i, result, 'should print success message'
+    end
+  end
 
   def test_cli_can_output_algorithms
     algorithms = %w(basic_de basic_en secure)

data/test/test_configs.rb

@@ -4,14 +4,22 @@ require File.expand_path('../helper', __FILE__)
 
 class TestConfigs < Test::Unit::TestCase
   def config
-    ToPass::ConfigReader.load('config')
+    @config ||= begin
+                  @config = nil
+
+                  without_config_user_dir do
+                    @config = ToPass::ConfigReader.load('config')
+                  end
+
+                  @config
+                end
   end
 
-  def test_default_algorithm_is_basic_de
+  def test_default_algorithm_is_secure
     result = config[:algorithm]
 
     assert_not_nil result, 'the algorithm should be configured by default'
-    assert_equal :basic_de, result
+    assert_equal :secure, result
   end
   def test_default_pipe_out_behaviour_is_false
     result = config[:pipe_out]
@@ -25,5 +33,4 @@ class TestConfigs < Test::Unit::TestCase
     assert_not_nil result
     assert_equal false, result
   end
-
 end

data/test/test_directories.rb

@@ -0,0 +1,48 @@
+# vim:ft=ruby:fileencoding=utf-8
+
+require File.expand_path('../helper', __FILE__)
+
+class TestDirectories < Test::Unit::TestCase
+  test_presence ToPass::Directories
+
+  def test_directories
+    assert_respond_to dirs, :[]
+
+    assert_equal '~/.to_pass', dirs[:user]
+    assert_equal "#{ruby_data_dir}/#{ToPass::APP_NAME}", dirs[:data]
+
+    if in_to_pass_soure_tree?
+      assert_equal Pathname.new("#{File.dirname(__FILE__)}/../").expand_path.to_s, dirs[:base]
+      assert_equal Pathname.new("#{File.dirname(__FILE__)}/../data/#{ToPass::APP_NAME}").expand_path.to_s, dirs[:source_data]
+    end
+
+    assert_equal [ dirs[:user], dirs[:data], dirs[:source_data] ], dirs[:standard]
+  end
+
+  def test_directories_can_be_extended
+    assert_respond_to dirs, :[]=
+
+    new_dir = Pathname.new('/tmp/my_to_pass')
+
+    assert_equal new_dir, ( dirs[:new] = new_dir )
+    assert_include new_dir, dirs
+    assert_equal new_dir, dirs[:new]
+
+    assert_include new_dir, dirs[:all]
+    assert_equal new_dir, dirs[:all].first
+  end
+
+  def test_directories_can_be_searched
+    assert_respond_to dirs, :include?
+
+    # assert_include(needle, haystack[, msg]) uses include? to verify.
+    assert_include :user, dirs
+    assert_include '~/.to_pass', dirs
+  end
+
+  protected
+
+  def dirs
+    ToPass::Directories
+  end
+end

data/test/tests.watchr

@@ -29,9 +29,12 @@ single_test = lambda { |m|
 watch '^data/to_pass/(algorithms|converters)/*.rb' do |m|
   single_or_all("test/test_#{m[1]}.rb")
 end
-watch '^data/config' do |m|
+watch '^data/to_pass/config' do |m|
   single_or_all("test/test_configs.rb")
 end
+watch '^test/(helper|all).rb' do |m|
+  run_all
+end
 
 # simple mappings
 watch '^lib/to_pass/(.*).rb',  &single_test

data/to_pass.gemspec

@@ -0,0 +1,34 @@
+# vim:ft=ruby:fileencoding=utf-8
+
+require File.expand_path('../lib/to_pass/version.rb', __FILE__)
+
+spec = Gem::Specification.new do |s|
+  s.name = ToPass::APP_NAME
+  s.version = ToPass::VERSION
+  s.date = ToPass::DATE
+  s.summary = ToPass::SUMMARY
+  s.description = ToPass::DESCRIPTION
+
+  s.authors = ["Matthias Viehweger"]
+  s.email = 'kronn@kronn.de'
+  s.homepage = 'http://github.com/kronn/to_pass'
+  s.rubyforge_project = '[none]' # to supress the warning
+
+  s.require_paths = ["lib"]
+  s.executables = ["password_of", "to_pass"]
+  s.files = `git ls-files`.split("\n") - ['.gitignore']
+  s.test_files = `git ls-files test`.split("\n")
+
+  s.has_rdoc = true
+  s.rdoc_options = ['--charset=utf-8', '--fmt=shtml', '--all', '--include=data/to_pass/converters/']
+  s.extra_rdoc_files = ToPass::EXTRA_RDOC_FILES
+  s.post_install_message = ToPass::RELEASE_NOTES
+
+
+  # for tests, needed
+  s.add_development_dependency 'mocha'
+
+  # for release and doc generation, more less optional
+  s.add_development_dependency 'ronn'
+  s.add_development_dependency 'sdoc'
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: to_pass
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
   - 0
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Matthias Viehweger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,14 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
+- .gemtest
+- .travis.yml
+- .vclog/rules.rb
+- .yardopts
+- Gemfile
+- README.rdoc
+- Rakefile
+- TODO
 - bin/password_of
 - bin/to_pass
 - data/to_pass/algorithms/basic_de.yml
@@ -111,8 +119,10 @@ files:
 - man/to_pass-algorithm.5.ronn
 - man/to_pass-converter.5.ronn
 - man/to_pass.1.ronn
+- setup.rb
 - test/all.rb
 - test/fixtures/user_alg.yml
+- test/fixtures/user_config
 - test/fixtures/user_converter.rb
 - test/helper.rb
 - test/test_algorithm_reader.rb
@@ -124,11 +134,11 @@ files:
 - test/test_converter.rb
 - test/test_converter_reader.rb
 - test/test_converters.rb
+- test/test_directories.rb
 - test/test_file_reader.rb
 - test/test_integration.rb
 - test/tests.watchr
-- README.rdoc
-- TODO
+- to_pass.gemspec
 has_rdoc: true
 homepage: http://github.com/kronn/to_pass
 licenses: []
@@ -169,6 +179,7 @@ summary: generate password from words or sentences
 test_files: 
 - test/all.rb
 - test/fixtures/user_alg.yml
+- test/fixtures/user_config
 - test/fixtures/user_converter.rb
 - test/helper.rb
 - test/test_algorithm_reader.rb
@@ -180,6 +191,7 @@ test_files:
 - test/test_converter.rb
 - test/test_converter_reader.rb
 - test/test_converters.rb
+- test/test_directories.rb
 - test/test_file_reader.rb
 - test/test_integration.rb
 - test/tests.watchr