ssbx 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8cac41924cd31245f471e60522d958da2b6a1d3b88161930aff945440f0b451
-  data.tar.gz: 420bc230bfc9f2df406617d32317cf6b8febc385bbfed6929c0862a59f794312
+  metadata.gz: f2132a8b2ea3e99b5af1a7fb19751560aeac5b2158bdecf1017e19f6bedadacd
+  data.tar.gz: ceb0e18fc93e884ccf133c6732ba4f564c60bac7fee5dc9a4f6032e69cac7957
 SHA512:
-  metadata.gz: 34009a357a04ffcb61df3c112e228fb18d6152d01e25f54b2e561f1b661e4fe9e4e74478d5828cb3eb108bd2f0f9be02a4ee8a9bce822f0363707993c671b2db
-  data.tar.gz: 976b293b5faa6dcf9ef2ec49e49b971cf77bd3c59b0ee09277d1f0f323b4257e20160103f6d9b8f0d16d5a030f0331e534a7fe1edbcebf5c7b29fae0cd95b81b
+  metadata.gz: fc0de25d170ab074b06e123eaa9ba962ba3734a5241421721ba2b145871ea2e01255713ce67f84e637f566e3071db5138bbbc57d6c73b477dd8baca67840f8f0
+  data.tar.gz: b953c1ac36b85f6997c8fc3b9d75474df865eb8d249d0c4531ff9bd0dd6be574b0b0ac5cc9b310debd84950a078336fd07cb18efa9030e7f0997d8afff451bf0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ssbx (0.1.4)
+    ssbx (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/exe/ssbx

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "ssbx"
+require 'ssbx/cli'
 require 'optparse'
 require 'yaml'
 require 'pp'
@@ -12,11 +13,7 @@ CONFIG = {
     'pass' => 'password',
 }
 
-default_config = File.join(ENV['HOME'], '.ssbx.yaml')
-if File.file? default_config
-    c = YAML::load(File.read(default_config))
-    CONFIG.merge!(c)
-end
+Ssbx::Cli::load_default(CONFIG)
 
 CONFIG['delete_users'] = []
 CONFIG['add_users'] = []
@@ -73,34 +70,7 @@ OptionParser.new do |opts|
 end.parse! ARGV
 
 if CONFIG['config']
-    print "User name? [#{ENV['USER']}]: "
-    CONFIG['user'] = STDIN.readline.chomp
-    CONFIG['user'] = ENV['USER'] if CONFIG['user'] == ''
-
-    require 'io/console'
-    STDIN.echo = false
-    print "Password: "
-    p = begin
-        STDIN.readline.chomp
-    ensure
-        STDIN.echo = true
-        puts ''
-    end
-    CONFIG['pass'] = p unless p == ''
-
-    print "Editor? [#{ENV['EDITOR']}]: "
-    e = STDIN.readline.chomp
-    CONFIG['editor'] = e unless e == ''
-
-    require 'yaml'
-    File.open(default_config, 'wb') do |io|
-        io.write(YAML::dump(
-            CONFIG.select do |k,v|
-                k !~ /^delete_users|add_users|config|verbose$/
-            end
-        ))
-
-    end
+    Ssbx::Cli::config(CONFIG)
 end
 
 if CONFIG['verbose']
@@ -108,132 +78,31 @@ if CONFIG['verbose']
     pp CONFIG
 end
 
-if CONFIG['pass'] == 'prompt'
-    require 'io/console'
-    print "Enter your password: "
-    STDIN.echo = false
-    begin
-        CONFIG['pass'] = STDIN.readline.chomp
-        puts ''
-    ensure
-        STDIN.echo = true
-    end
-
-end
-
 if CONFIG['change_password']
-    require 'io/console'
-    STDIN.echo = false
-    begin
-        print("Old password: ")
-        old_pw = STDIN.readline.chomp
-        print("\nNew password: ")
-        new_pw1 = STDIN.readline.chomp
-        print("\nRetype new password: ")
-        new_pw2 = STDIN.readline.chomp
-        puts ''
-
-        if new_pw1 != new_pw2
-            puts "Old and new passwords do not match. Taking no action."
-        else
-            f = Ssbx::File.new
-            bx = Ssbx::Box.new(f)
-
-            # Decrypt with the old key.
-            data = Ssbx::Util.read(CONFIG['file']) { |io| bx.read(io, CONFIG['user'], old_pw) }
-
-            Ssbx::Util.write(CONFIG['file']) { |io| bx.write(io, CONFIG['user'], new_pw1, data) }
-
-        end
-    ensure
-        STDIN.echo = true
-    end
+    Ssbx::Cli::change_password(CONFIG)
 end
 
 CONFIG['delete_users'].each do |u|
-    f = Ssbx::Util.read(CONFIG['file']) { |io| Ssbx::File.new(io) }
-    bx = Ssbx::Box.new(f)
-    bx.remove_user(u)
-    Ssbx::Util.write(CONFIG['file']) { |io| f.write(io) }
+    Ssbx::Cli::delete_users(CONFIG)
 end
 
 if CONFIG['add_users'].length > 0
-    f = Ssbx::File.new
-    bx = Ssbx::Box.new(f)
-    data = Ssbx::Util.read(CONFIG['file']) do |io|
-        bx.read(io, CONFIG['user'], CONFIG['pass'])
-    end
+    Ssbx::Cli::add_users(CONFIG)
+end
 
-    CONFIG['add_users'].each do |u|
-        u, p = u[0], u[1] || u[0]
-        
-        Ssbx::Util.write(CONFIG['file']) do |io|
-            bx.write(io, u, p, data)
-        end 
-    end
+if CONFIG['list']
+    Ssbx::Cli::list_users(CONFIG)
 end
 
 if CONFIG['set']
-    f = Ssbx::File.new
-    bx = Ssbx::Box.new(f)
-    data = Ssbx::Util.read(CONFIG['set']) do |io|
-        io.read
-    end
-    Ssbx::Util.write(CONFIG['file']) do |io|
-        bx.write(io, CONFIG['user'], CONFIG['pass'], data)
-    end 
+    Ssbx::Cli::set(CONFIG)
 end
 
 if CONFIG['out']
-    f = Ssbx::File.new
-    bx = Ssbx::Box.new(f)
-    data = Ssbx::Util.read(CONFIG['file']) do |io|
-        bx.read(io, CONFIG['user'], CONFIG['pass'])
-    end
-
-    Ssbx::Util.write(CONFIG['out']) { |io| io.write(data) }
+    Ssbx::Cli::get(CONFIG)
 end
 
 if CONFIG['edit']
-    f = Ssbx::File.new
-    bx = Ssbx::Box.new(f)
-
-    data = if File.file? CONFIG['file']
-        Ssbx::Util.read(CONFIG['file']) do |io|
-            bx.read(io, CONFIG['user'], CONFIG['pass'])
-        end
-    else
-        ''
-    end
-
-    tmpfile = Tempfile.new("ssbx")
-    tmpfile.write(data)
-    tmpfile.flush
-
-    begin
-        editor = CONFIG['editor'] || ENV['EDITOR']
-
-        system("#{editor} #{tmpfile.path}")
-
-        tmpfile.rewind
-        data = File.read(tmpfile)
-        File.open(CONFIG['file'], 'wb') do |io|
-            bx.write(io, CONFIG['user'], CONFIG['pass'], data)
-        end
-    ensure
-        tmpfile.unlink
-    end
+    Ssbx::Cli::edit(CONFIG)
 end
 
-if CONFIG['list']
-    f = Ssbx::File.new
-    bx = Ssbx::Box.new(f)
-
-    Ssbx::Util.read(CONFIG['file']) do |io|
-        f.read(io)
-    end
-
-    bx.list.each do |u|
-        puts u
-    end
-end

data/lib/ssbx/cli.rb

@@ -0,0 +1,6 @@
+
+require 'ssbx/cli/config_task'
+require 'ssbx/cli/get_password_task'
+require 'ssbx/cli/change_password_task'
+require 'ssbx/cli/user_task'
+require 'ssbx/cli/edit_task'

data/lib/ssbx/cli/change_password_task.rb

@@ -0,0 +1,37 @@
+require 'io/console'
+
+require 'ssbx/file'
+require 'ssbx/box'
+require 'ssbx/util'
+
+module Ssbx
+    module Cli
+        def self.change_password(config)
+            STDIN.echo = false
+            begin
+                print("Old password: ")
+                old_pw = STDIN.readline.chomp
+                print("\nNew password: ")
+                new_pw1 = STDIN.readline.chomp
+                print("\nRetype new password: ")
+                new_pw2 = STDIN.readline.chomp
+                puts ''
+        
+                if new_pw1 != new_pw2
+                    puts "Old and new passwords do not match. Taking no action."
+                else
+                    f = Ssbx::File.new
+                    bx = Ssbx::Box.new(f)
+        
+                    # Decrypt with the old key.
+                    data = Ssbx::Util.read(config['file']) { |io| bx.read(io, config['user'], old_pw) }
+        
+                    Ssbx::Util.write(config['file']) { |io| bx.write(io, config['user'], new_pw1, data) }
+        
+                end
+            ensure
+                STDIN.echo = true
+            end
+        end
+    end
+end

data/lib/ssbx/cli/config_task.rb

@@ -0,0 +1,46 @@
+require 'io/console'
+require 'yaml'
+
+module Ssbx
+    module Cli
+
+        @@default_config_file = ::File.join(ENV['HOME'], '.ssbx.yaml')
+
+        def self.load_default(config)
+            if ::File.file? @@default_config_file
+                c = YAML::load(::File.read(@@default_config_file))
+                config.merge!(c)
+            end
+        end
+
+        def self.config(config)
+            print "User name? [#{ENV['USER']}]: "
+            config['user'] = STDIN.readline.chomp
+            config['user'] = ENV['USER'] if config['user'] == ''
+        
+            require 'io/console'
+            STDIN.echo = false
+            print "Password: "
+            p = begin
+                STDIN.readline.chomp
+            ensure
+                STDIN.echo = true
+                puts ''
+            end
+            config['pass'] = p unless p == ''
+        
+            print "Editor? [#{ENV['EDITOR']}]: "
+            e = STDIN.readline.chomp
+            config['editor'] = e unless e == ''
+        
+            require 'yaml'
+            ::File.open(@@default_config_file, 'wb') do |io|
+                io.write(YAML::dump(
+                    config.select do |k,v|
+                        k !~ /^delete_users|add_users|config|verbose$/
+                    end
+                ))
+            end
+        end
+    end
+end

data/lib/ssbx/cli/edit_task.rb

@@ -0,0 +1,61 @@
+require 'ssbx/file'
+require 'ssbx/box'
+require 'ssbx/cli/get_password_task'
+require 'tempfile'
+module Ssbx
+    module Cli
+
+        def self.set(config)
+            f = Ssbx::File.new
+            bx = Ssbx::Box.new(f)
+            data = Ssbx::Util.read(config['set']) do |io|
+                io.read
+            end
+            Ssbx::Util.write(config['file']) do |io|
+                bx.write(io, config['user'], get_password(config), data)
+            end 
+        end
+
+        def self.get(config)
+            f = Ssbx::File.new
+            bx = Ssbx::Box.new(f)
+            data = Ssbx::Util.read(config['file']) do |io|
+                bx.read(io, config['user'], get_password(config))
+            end
+        
+            Ssbx::Util.write(config['out']) { |io| io.write(data) }
+        end
+
+        def self.edit(config)
+            f = Ssbx::File.new
+            bx = Ssbx::Box.new(f)
+            p = get_password(config)
+        
+            data = if ::File.file? config['file']
+                Ssbx::Util.read(config['file']) do |io|
+                    bx.read(io, config['user'], p)
+                end
+            else
+                ''
+            end
+        
+            tmpfile = Tempfile.new("ssbx")
+            tmpfile.write(data)
+            tmpfile.flush
+        
+            begin
+                editor = config['editor'] || ENV['EDITOR']
+        
+                system("#{editor} #{tmpfile.path}")
+        
+                tmpfile.rewind
+                data = ::File.read(tmpfile)
+                ::File.open(config['file'], 'wb') do |io|
+                    bx.write(io, config['user'], p, data)
+                end
+            ensure
+                tmpfile.unlink
+            end        
+        end
+    end
+end

data/lib/ssbx/cli/get_password_task.rb

@@ -0,0 +1,20 @@
+require 'io/console'
+
+module Ssbx
+    module Cli
+        def self.get_password(config)
+            if config['pass'] == 'prompt'
+                print "Enter your password: "
+                STDIN.echo = false
+                begin
+                    config['pass'] = STDIN.readline.chomp
+                    puts ''
+                ensure
+                    STDIN.echo = true
+                end
+            end
+
+            config['pass']
+        end
+    end
+end

data/lib/ssbx/cli/user_task.rb

@@ -0,0 +1,48 @@
+require 'ssbx/file'
+require 'ssbx/box'
+require 'ssbx/cli/get_password_task'
+
+module Ssbx
+    module Cli
+        def self.list_users(config)
+            f = Ssbx::File.new
+            bx = Ssbx::Box.new(f)
+        
+            Ssbx::Util.read(config['file']) do |io|
+                f.read(io)
+            end
+        
+            bx.list.each do |u|
+                puts u
+            end           
+        end
+
+        def self.delete_users(config)
+            config['delete_users'].each do |u|
+                f = Ssbx::Util.read(config['file']) { |io| Ssbx::File.new(io) }
+                bx = Ssbx::Box.new(f)
+                bx.remove_user(u)
+                Ssbx::Util.write(config['file']) { |io| f.write(io) }
+            end
+        end
+        
+        def self.add_users(config)
+            f = Ssbx::File.new
+            bx = Ssbx::Box.new(f)
+            p = get_password(config)
+            
+            data = Ssbx::Util.read(config['file']) do |io|
+                bx.read(io, config['user'], p)
+            end
+        
+            config['add_users'].each do |u|
+                u, p = u[0], u[1] || u[0]
+                
+                Ssbx::Util.write(config['file']) do |io|
+                    bx.write(io, u, p, data)
+                end 
+            end
+        end
+        
+    end
+end

data/lib/ssbx/version.rb

@@ -1,3 +1,3 @@
 module Ssbx
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssbx
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sam
@@ -58,6 +58,12 @@ files:
 - exe/ssbx
 - lib/ssbx.rb
 - lib/ssbx/box.rb
+- lib/ssbx/cli.rb
+- lib/ssbx/cli/change_password_task.rb
+- lib/ssbx/cli/config_task.rb
+- lib/ssbx/cli/edit_task.rb
+- lib/ssbx/cli/get_password_task.rb
+- lib/ssbx/cli/user_task.rb
 - lib/ssbx/file.rb
 - lib/ssbx/util.rb
 - lib/ssbx/version.rb
@@ -84,7 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Shared encrypted file.