2pass 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bc01e1efadcf89aa03153837fe43b43636879457474ed74ec1cc7e8fd23c6db
-  data.tar.gz: f1bc2a3daaf6925a81106c4eae4b7e5ab54a56a31eaf115bca3672523056db3c
+  metadata.gz: dbffa6c36a23a40c4ec93bc9f0277cf43d3e2388b61459a89aad0bb89458451e
+  data.tar.gz: 5ab72d0c03fb7b718aaec180fdb530755ad69394acb6f808918b978044174e47
 SHA512:
-  metadata.gz: aa7041a6501a9214ee30a21482de8fb5251c35731d23e95f3de87dd746f9c85c8bbc3f6cc03dfadf0126e994ea326e40175a7a408434d98f3bd43f1659ce4473
-  data.tar.gz: 433739132ea8b97032bc3a602da682a655a3a657adaa58d6b32828edd884de102ee2696c1f3f6c01e57b01fd59dc51121c08215f2335c6277e3dcab09f48ca2d
+  metadata.gz: 0f0bce6612b408712dac5d313331b8721703f89a4a695ff0d7fd23076d6fcaf7bd2fdec67bdf75c1504f98d59dd400fe04bfa70f729847e234b13ab114d03eb6
+  data.tar.gz: 06d625e2325531c59eff3d197eab64ed3265de9c93ab4046ff39c81f7057ceecb3c2cd640cccc70f9073da3975a3eac9e14fdbaf185242ff4141a0ea1bc6a517

data/2pass.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = ["2pass"]
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 3.3"
+
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"

data/bin/2pass

@@ -7,7 +7,8 @@ def help_message
     Usage:
       2pass add <vault_name> <id> <value>   - Add new secret
       2pass get <vault_name> <id>           - Get content by ID from the specified vault
-      2pass list <vault_name>               - List the content of the specified vault
+      2pass list <vault_name>               - List the content of the specified vault as key-value pairs
+      2pass list <vault_name> --json        - List the content of the specified vault as JSON
       2pass link <vault_name> <target_path> - Create a symlink for an existing vault. Useful when the vault is stored in a synced place (iCloud, Dropbox, etc.)
       2pass -h                              - Display this help message
   HELP
@@ -20,6 +21,15 @@ OptionParser.new do |opts|
   opts.on("-h", "--help", "Display this help message") do
     options[:help] = true
   end
+  opts.on("-v", "--version", "Display the version") do
+    options[:version] = true
+  end
+  opts.on("-f", "--format", "Specify output format (e.g., json)") do |format|
+    options[:format] = format == "json" ? :json : :text
+  end
+  opts.on("--json", "Use JSON output format (same as -f json)") do
+    options[:format] = :json
+  end
 end.parse!
 
 if options[:help]
@@ -27,6 +37,11 @@ if options[:help]
   exit
 end
 
+if options[:version]
+  puts TwoPass::VERSION
+  exit
+end
+
 if ARGV.length < 2
   help_message
   exit(1)
@@ -35,30 +50,35 @@ end
 command, vault_name, *args = ARGV
 
 begin
-  case command
-  when "get"
+  case command&.to_sym
+  when :get
     if args.length < 1
       help_message
       exit(1)
     end
     id = args[0]
     puts TwoPass.get_secret(vault_name, id)
-  when "add"
+  when :add
     if args.length != 2
       help_message
       exit(1)
     end
     TwoPass.add_secret(vault_name, args[0], args[1])
-  when "list"
-    puts TwoPass.list_content(vault_name)
-  when "link"
+  when :list
+    if options[:format] == :json
+      puts TwoPass.list_content(vault_name, format: :json)
+    else
+      puts TwoPass.list_content(vault_name)
+    end
+    exit(1)
+  when :link
     if args.length < 1
       help_message
       exit(1)
     end
     target_path = args[0]
     TwoPass.create_symlink(vault_name, target_path)
-  when "help"
+  when :help
     help_message
   else
     help_message
@@ -71,5 +91,5 @@ rescue => e
     STDERR.puts e.backtrace
   end
 
-  exit 1
+  exit(1)
 end

data/lib/2pass/version.rb

@@ -1,3 +1,3 @@
 module TwoPass
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/lib/2pass.rb

@@ -9,61 +9,74 @@ require_relative "2pass/version"
 module TwoPass
   VAULT_DIR = "#{Dir.home}/.2pass"
 
-  def self.create_symlink(vault_name, target_path)
-    FileUtils.mkdir_p(VAULT_DIR)
-    symlink_path = "#{VAULT_DIR}/#{vault_name}.yml"
+  class << self
+    def create_symlink(vault_name, target_path)
+      FileUtils.mkdir_p(VAULT_DIR)
+      symlink_path = "#{VAULT_DIR}/#{vault_name}.yml"
 
-    if File.exist?(symlink_path)
-      puts "Symlink already exists: #{symlink_path}"
-    else
-      File.symlink(target_path, symlink_path)
-      puts "Created symlink: #{symlink_path} -> #{target_path}"
+      if File.exist?(symlink_path)
+        puts "Symlink already exists: #{symlink_path}"
+      else
+        File.symlink(target_path, symlink_path)
+        puts "Created symlink: #{symlink_path} -> #{target_path}"
+      end
     end
-  end
 
-  def self.load_vault(vault_name)
-    file_path = "#{VAULT_DIR}/#{vault_name}.yml"
-    return [] unless File.exist?(file_path)
+    def load_vault(vault_name)
+      file_path = "#{VAULT_DIR}/#{vault_name}.yml"
+      return [] unless File.exist?(file_path)
 
-    YAML.load_file(file_path, symbolize_names: true) || []
-  rescue Psych::SyntaxError => e
-    STDERR.puts "Error parsing YAML file: #{e.message}"
-    []
-  end
+      YAML.load_file(file_path, symbolize_names: true) || []
+    rescue Psych::SyntaxError => e
+      STDERR.puts "Error parsing YAML file: #{e.message}"
+      []
+    end
 
-  def self.save_vault(vault_name, data)
-    FileUtils.mkdir_p(VAULT_DIR)
-    file_path = "#{VAULT_DIR}/#{vault_name}.yml"
-    File.write(file_path, YAML.dump(data))
-  end
+    def save_vault(vault_name, data)
+      FileUtils.mkdir_p(VAULT_DIR)
+      file_path = "#{VAULT_DIR}/#{vault_name}.yml"
+      File.write(file_path, YAML.dump(data))
+    end
 
-  def self.list_content(vault_name)
-    vault = load_vault(vault_name)
-    JSON.pretty_generate(vault)
-  end
+    def list_content(vault_name, format: :text)
+      vault = load_vault(vault_name)
+      if format == :text
+        vault
+          .map { |h| "#{h[:id]}=#{h[:value]}" }
+          .sort
+          .join("\n")
+      else
+        JSON.pretty_generate(
+          vault
+            .map { |hash| hash.slice(:id, :value) }
+            .sort_by { |hash| hash[:id] }
+        )
+      end
+    end
 
-  def self.add_secret(vault_name, id, value)
-    new_secret = {
-      id: id,
-      value: value,
-      uuid: SecureRandom.uuid
-    }
-    data = load_vault(vault_name)
-    existing_entry_id = data.find_index { |hash| hash[:id] == new_secret[:id] }
-    if existing_entry_id
-      raise "The secret already exists"
+    def add_secret(vault_name, id, value)
+      new_secret = {
+        id: id,
+        value: value,
+        uuid: SecureRandom.uuid
+      }
+      data = load_vault(vault_name)
+      existing_entry_id = data.find_index { |hash| hash[:id] == new_secret[:id] }
+      if existing_entry_id
+        raise "The secret already exists"
+      end
+      data << new_secret
+      save_vault(vault_name, data)
     end
-    data << new_secret
-    save_vault(vault_name, data)
-  end
 
-  def self.get_secret(vault_name, id)
-    vault = load_vault(vault_name)
-    entry = vault.find { |hash| hash[:id] == id }
-    if entry
-      entry[:value]
-    else
-      raise "Entry not found"
+    def get_secret(vault_name, id)
+      vault = load_vault(vault_name)
+      entry = vault.find { |hash| hash[:id] == id }
+      if entry
+        entry[:value]
+      else
+        raise "Entry not found"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 2pass
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Olivier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="