From 5296e3d2780d3c01dc91fadfb8e2cf32a4c5642a Mon Sep 17 00:00:00 2001 From: Delon Newman Date: Fri, 2 Mar 2012 19:57:35 -1000 Subject: [PATCH] removed tabs --- bin/cat-keys | 20 ++++++------- bin/generate-rest-keys | 2 +- lib/sinatra/rest-service-auth/generator.rb | 30 +++++++++---------- .../rest-service-auth/key-generator.rb | 30 +++++++++---------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bin/cat-keys b/bin/cat-keys index 42f805f..01dddcd 100755 --- a/bin/cat-keys +++ b/bin/cat-keys @@ -2,8 +2,8 @@ require 'yaml' unless ARGV.first - puts "Usage: #$0 FILE" - exit + puts "Usage: #$0 FILE" + exit end file = ARGV.first @@ -11,17 +11,17 @@ keys = $stdin.read.split("\n") config = nil if File.exists? file - config = YAML.load_file file + config = YAML.load_file file - if config['keys'] - config['keys'].push(keys).flatten! - else - config['keys'] = keys - end + if config['keys'] + config['keys'].push(keys).flatten! + else + config['keys'] = keys + end else - config = { 'keys' => keys } + config = { 'keys' => keys } end File.open(file, 'w') do |f| - f.write config.to_yaml + f.write config.to_yaml end diff --git a/bin/generate-rest-keys b/bin/generate-rest-keys index 206e0b4..2f661e9 100755 --- a/bin/generate-rest-keys +++ b/bin/generate-rest-keys @@ -8,7 +8,7 @@ num_keys = ARGV.first.to_i || 1 keys = [] num_keys.times_with_progress("Generating #{num_keys} Keys") do - keys.push Sinatra::RESTServiceAuth::KeyGenerator.new(1).generate_keys.first.to_s + keys.push Sinatra::RESTServiceAuth::KeyGenerator.new(1).generate_keys.first.to_s end puts keys.join("\n") diff --git a/lib/sinatra/rest-service-auth/generator.rb b/lib/sinatra/rest-service-auth/generator.rb index 07e0a51..58493be 100644 --- a/lib/sinatra/rest-service-auth/generator.rb +++ b/lib/sinatra/rest-service-auth/generator.rb @@ -2,23 +2,23 @@ require 'bcrypt' module Sinatra - module RESTServiceAuth - class Generator - attr_reader :keys + module RESTServiceAuth + class Generator + attr_reader :keys - def initialize(num_keys=1) - @num_keys = num_keys + def initialize(num_keys=1) + @num_keys = num_keys - @keys = [] - end + @keys = [] + end - def generate_keys - @num_keys.times do |i| - @keys.push BCrypt::Password.create(srand) - end + def generate_keys + @num_keys.times do |i| + @keys.push BCrypt::Password.create(srand) + end - self - end - end - end + self + end + end + end end diff --git a/lib/sinatra/rest-service-auth/key-generator.rb b/lib/sinatra/rest-service-auth/key-generator.rb index ea711cd..6dd65f9 100644 --- a/lib/sinatra/rest-service-auth/key-generator.rb +++ b/lib/sinatra/rest-service-auth/key-generator.rb @@ -2,23 +2,23 @@ require 'bcrypt' module Sinatra - module RESTServiceAuth - class KeyGenerator - attr_reader :keys + module RESTServiceAuth + class KeyGenerator + attr_reader :keys - def initialize(num_keys=1) - @num_keys = num_keys + def initialize(num_keys=1) + @num_keys = num_keys - @keys = [] - end + @keys = [] + end - def generate_keys - @keys = (1..@num_keys).map do |i| - BCrypt::Password.create(srand) - end + def generate_keys + @keys = (1..@num_keys).map do |i| + BCrypt::Password.create(srand) + end - @keys - end - end - end + @keys + end + end + end end