h 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2252b8ef1fd60b325187cc109d55b7877a737de
-  data.tar.gz: 86ec92d920c7ee56b6b810b38a36d3e9af5c4e59
+  metadata.gz: c07dc8a1160801aa395ef4a00a614038c5ce47b3
+  data.tar.gz: a2cc31855430b3c748f052d940f18efba1aeb178
 SHA512:
-  metadata.gz: 60086b1404f5b51e36f2007f044780614693545a736990d826dfb03ae8f92498a8f741eb4f87eda8d0430868ed11a71d0e7ec3b1f81dac444887bf9bc3122737
-  data.tar.gz: 5ac7b4848c58bb7b4f4c2a110bd25974ee57661c2db0325cae63023712fd273bae49d3a3663a24408083c7913b282014896adb59a330397e45337eb2ac15a344
+  metadata.gz: f119cb301bca5c0245bc4ec16a28999730a509c250759c87a482becda3ef653c40704ce1bb859b0ab45779253159201ac1e478296004c123ab0a08f793068570
+  data.tar.gz: 5382479ddf4fd3cb89a31612ba1d1bb213953a64ec5fdd4168c5c42cda9ec4f1f7924705e8a584efa161904b25a533218ee6c347dcc94b276fdcdf17b60e9b38

data/.gitignore

@@ -1,5 +1,4 @@
 *.gem
 .bundle
-.env
 Gemfile.lock
 pkg/*

data/Gemfile

@@ -1,9 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.1.1'
-
 gemspec
 
 gem 'rake'
 gem 'highline'
-gem 'dotenv'

data/README.md

@@ -1,79 +1,49 @@
-H
-=
+# H
 
-Overview
---------
+## Overview
 
-Very small cryptographic tool that generates on-the-fly custom message digests,
-according to some parameters.
+Small tool that generates salted hashes, scented with the SHA2 function.
 
-Why?
-----
+## Why?
 
-Because I prefer to put makeup on passwords rather than yield them to Manager™.
+> I prefer to put makeup on passwords rather than yield them to Manager™.
 
-Installation
-------------
+## Installation
 
     $ gem install h
 
-Configuration
--------------
+## Configuration
 
-H reads its configuration from the YAML `~/.h` file at initialization.
-This file, which should be readable by its owner only, has four parameters:
+H reads its configuration from the `~/.h` file at initialization.  This file, which should be readable by its owner only, have the salt value.
 
- * Max length: The maximum length of returned message digests.
- * Radix: The number of unique digits that compose message digests.
- * Encryption: A cryptographic hash function in Ruby's Digest module.
- * Static key: Provides salted messages through concatenation.
-
-Examples
---------
+## Examples
 
 Generate a digest from the system:
 
-    $ h secret
-    t3dpe24xie3y74t
-
-Because no configuration has been detected, this default file was created:
-
-    $ cat ~/.h
-    ---
-    max_length: 15
-    radix: 36
-    encryption: SHA1
-    static_key: foobar
+    $ echo "塩" > ~/.h
+    $ h シークレット
+    -q0zMnMSszj8D23a8aNJX_VYry9oSSLZ30XlHkmFt9I=
+    $ h secret 3
+    -q0
 
 Same operation, from Ruby:
 
     irb(main):001:0> require "h"
     true
-    irb(main):002:0> H::Generator.new.input "secret"
-    "t3dpe24xie3y74t"
+    irb(main):002:0> H::Generator.new("塩").input "シークレット", 3
+    "-q0"
 
 To prevent your log display the message as a string, do not specify it at first.
 
     $ h
     Message: ******
-    t3dpe24xie3y74t
-
-Example with the SHA2 cryptographic hash instead of SHA1, and a custom key:
+    -q0zMnMSszj8D23a8aNJX_VYry9oSSLZ30XlHkmFt9I=
 
-    $ echo "{max_length: 15, radix: 36, encryption: SHA2, static_key: sun}" > ~/.h
-    $ h secret
-    5gumh4smv1iit23
-
-And now a useless test, with conventional parameters. You can Google the result.
-
-    $ echo "{max_length: 40, radix: 16, encryption: SHA1, static_key: ''}" > ~/.h
-    $ h "The quick brown fox jumps over the lazy dog"
-    2fd4e1c67a2d28fced849ee1bb76e7391b93eb12
-
-Code Status
------------
+## Code Status
 
 * [![Build Status](https://secure.travis-ci.org/cyril/h.png)](http://travis-ci.org/cyril/h)
 * [![Dependencies Status](https://gemnasium.com/cyril/h.png?travis)](https://gemnasium.com/cyril/h)
 
-Copyright (c) 2011 Cyril Wack, released under the ISC license
+* * *
+
+Copyright (c) 2014 Cyril Wack, released under the [ISC license](LICENSE.md)

data/VERSION.semver

@@ -0,0 +1 @@
+2.1.1

data/bin/h

@@ -6,9 +6,9 @@ h = H::Generator.new
 
 result = if ARGV.first
   if ARGV[1]
-    h.input ARGV[0], ARGV[1].to_i
+    h.input ARGV[0].to_s, ARGV[1].to_i
   else
-    h.input ARGV[0]
+    h.input ARGV[0].to_s
   end
 else
   h.prompt

data/h.gemspec

@@ -1,23 +1,22 @@
 # encoding: utf-8
 
-require 'yaml'
-
 Gem::Specification.new do |s|
   s.name        = 'h'
-  s.version     = YAML.load_file('VERSION.yml').values.join('.')
+  s.version     = File.read('VERSION.semver')
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Cyril Wack']
   s.email       = ['contact@cyril.io']
   s.homepage    = 'https://github.com/cyril/h'
-  s.summary     = %q{Custom hash generator}
-  s.description = %q{A quick tool for those who prefer to put makeup on passwords rather than yield them to Manager™}
+  s.summary     = %q{Salted hashes tool}
+  s.description = %q{Small tool that generates salted hashes, scented with the SHA2 function, for those who prefer to put makeup on passwords rather than yield them to Manager™.}
+  s.license     = 'ISC'
 
   s.rubyforge_project = 'h'
 
   s.bindir      = 'bin'
   s.executables = ['h']
 
-  s.add_dependency 'highline'
+  s.add_runtime_dependency 'highline'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/h.rb

@@ -1,33 +1,48 @@
-require 'rubygems'
-require 'bundler'
-
-Bundler.require
-
 require 'highline/import'
 require 'digest'
-require 'dotenv'
-Dotenv.load
 
 module H
   class Generator
+    CONF_PATH = File.join(File.expand_path('~'), '.h')
+
+    def initialize(static_key = nil)
+      @static_key = if static_key
+        static_key
+      else
+        unless File.exists?(CONF_PATH)
+          print "Creating #{CONF_PATH} file... "
+
+          File.open(CONF_PATH, 'w') do |f|
+            f.write('secret')
+          end
+
+          File.chmod(0600, CONF_PATH)
+
+          puts "Done."
+        end
+
+        File.open(CONF_PATH).readlines.first.chomp
+      end
+    end
+
     def prompt
       input ask('Message: ') {|q| q.echo = '*' }
     end
 
     def input(m, l = 44)
-      m = m + ENV.fetch('STATIC_KEY')
+      m = m + @static_key
       d = cryptographic_hash(m)
       truncate d, l
     end
 
     protected
 
-    def cryptographic_hash(message)
-      Digest::SHA2.base64digest(message).tr('+/', '-_')
+    def cryptographic_hash(m)
+      Digest::SHA2.base64digest(m).tr('+/', '-_')
     end
 
-    def truncate(string, length)
-      string[0, length]
+    def truncate(str, lng)
+      str[0, lng]
     end
   end
 end

data/test/_test_helper.rb

@@ -1,4 +1,2 @@
 require 'h'
 require 'minitest/autorun'
-
-ENV['STATIC_KEY'] = 'secret-key-here'

data/test/test_h.rb

@@ -1,12 +1,17 @@
+# encoding: utf-8
+
 require_relative '_test_helper'
 
 class HTest < MiniTest::Unit::TestCase
-  def setup
-    @h = H::Generator.new
-  end
-
   def test_h
-    assert_equal @h.input('p@ssw0rd'),    'SdsRrcHHSpJvfhkPM8Np047CocaWRQ2nzPYEw9qWYIo='
-    assert_equal @h.input('p@ssw0rd', 8), 'SdsRrcHH'
+    @h = H::Generator.new('my-salt')
+
+    assert_equal @h.input('p@ssw0rd'),    'LCoF25LqK6yFMRs6OoQoZEI4GV4-gR7vd1JZtbi8swA='
+    assert_equal @h.input('p@ssw0rd', 8), 'LCoF25Lq'
+
+    @h = H::Generator.new('塩')
+
+    assert_equal @h.input('シークレット'),    '-q0zMnMSszj8D23a8aNJX_VYry9oSSLZ30XlHkmFt9I='
+    assert_equal @h.input('シークレット', 3), '-q0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Cyril Wack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -24,8 +24,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A quick tool for those who prefer to put makeup on passwords rather than
-  yield them to Manager™
+description: Small tool that generates salted hashes, scented with the SHA2 function,
+  for those who prefer to put makeup on passwords rather than yield them to Manager™.
 email:
 - contact@cyril.io
 executables:
@@ -33,22 +33,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env.example"
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- ISC-LICENSE.md
+- LICENSE.md
 - README.md
 - Rakefile
-- VERSION.yml
+- VERSION.semver
 - bin/h
 - h.gemspec
 - lib/h.rb
 - test/_test_helper.rb
 - test/test_h.rb
 homepage: https://github.com/cyril/h
-licenses: []
+licenses:
+- ISC
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -69,7 +69,7 @@ rubyforge_project: h
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Custom hash generator
+summary: Salted hashes tool
 test_files:
 - test/_test_helper.rb
 - test/test_h.rb

data/.env.example

@@ -1 +0,0 @@
-STATIC_KEY=secret

data/VERSION.yml

@@ -1,4 +0,0 @@
----
-:major: 2
-:minor: 0
-:patch: 0