pk 0.0.5 → 0.0.6

data/README.md

@@ -24,6 +24,9 @@ pk team list team1
 # print public keys
 pk keys team1 member1,member2
 pk keys team1
+
+pkeys team1 member1,member2
+pkeys team1
 ```
 
 ## Rough cut version

data/bin/pk

@@ -1,98 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'thor'
+require 'pk/main'
 
-class PkIgnoreFile
-  PKIGNORE_NAMES = %w(pkignore .pkignore).freeze
-
-  def initialize(path)
-    @ignore_list = PKIGNORE_NAMES.dup
-    PKIGNORE_NAMES.each do |filename|
-      file = File.expand_path(File.join(path, filename))
-      if File.exist? file
-        @ignore_list = @ignore_list + File.open(file, 'r').read.split("\n")
-        break
-      end
-    end
-  end
-
-  def ignore_file?(filename)
-    ignore = false
-    @ignore_list.each do |ignore_pattern|
-      if File.fnmatch(ignore_pattern, filename, File::FNM_PATHNAME)
-        ignore = true
-        break
-      end
-    end
-    ignore
-  end
-end
-
-module Helper
-
-  def init
-    `mkdir -p ~/.pk/data/`
-  end
-
-  def all_members_of(team)
-    pkignore = PkIgnoreFile.new("~/.pk/data/#{team}")
-    [].tap do |list|
-      `ls ~/.pk/data/#{team}`.split.each do |filename|
-        list << filename unless pkignore.ignore_file?(filename)
-      end
-    end
-  end
-end
-
-class Team < Thor
-  include Helper
-
-  desc "add NAME, GIT_URL", "add team repo via git clone"
-  def add(name, git_url)
-    init
-    `git clone #{git_url} ~/.pk/data/#{name}`
-  end
-
-  desc "reload [TEAM]", "reload a team repo, or all teams if not specified"
-  def reload(team=nil)
-    init
-    teams = Dir["#{ENV["HOME"]}/.pk/data/*/"].map{|f| File.basename(f) }
-    teams = teams.select{|t| t == team} if team
-    teams.each do |t|
-      `cd ~/.pk/data/#{t} && git pull && cd -`
-    end
-  end
-
-  desc "list [TEAM]", "list all team, or team members if team is specified"
-  def list(team=nil)
-    init
-    if team
-      all_members_of(team).each do |m|
-        puts m
-      end
-    else
-      `ls ~/.pk/data`.split.each do |t|
-        puts t
-      end
-    end
-  end
-
-end
-
-class Pk < Thor
-  include Helper
-
-  desc "keys TEAM [MEMBER1,MEMBER2,..]", "print public keys of members in a specific team"
-  def keys(team, members=nil)
-    init
-    member_list = members ? members.split(',').compact : all_members_of(team)
-    member_list.each do |member|
-      puts `cat ~/.pk/data/#{team}/#{member}`
-    end
-  end
-
-  desc "team", "manage teams"
-  subcommand "team", Team
-end
-
-Pk.start
+Pk::Main.start

data/bin/pkeys

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'pk/main'
+
+Pk::Keys.start

data/lib/pk/helper.rb

@@ -0,0 +1,19 @@
+require 'pk/ignore_file'
+
+module Pk
+  module Helper
+
+    def init
+      `mkdir -p ~/.pk/data/`
+    end
+
+    def all_members_of(team)
+      pkignore = Pk::IgnoreFile.new("~/.pk/data/#{team}")
+      [].tap do |list|
+        `ls ~/.pk/data/#{team}`.split.each do |filename|
+          list << filename unless pkignore.ignore_file?(filename)
+        end
+      end
+    end
+  end
+end

data/lib/pk/ignore_file.rb

@@ -0,0 +1,27 @@
+module Pk
+  class IgnoreFile
+    PKIGNORE_NAMES = %w(pkignore .pkignore).freeze
+
+    def initialize(path)
+      @ignore_list = PKIGNORE_NAMES.dup
+      PKIGNORE_NAMES.each do |filename|
+        file = File.expand_path(File.join(path, filename))
+        if File.exist? file
+          @ignore_list = @ignore_list + File.open(file, 'r').read.split("\n")
+          break
+        end
+      end
+    end
+
+    def ignore_file?(filename)
+      ignore = false
+      @ignore_list.each do |ignore_pattern|
+        if File.fnmatch(ignore_pattern, filename, File::FNM_PATHNAME)
+          ignore = true
+          break
+        end
+      end
+      ignore
+    end
+  end
+end

data/lib/pk/keys.rb

@@ -0,0 +1,26 @@
+require 'thor'
+require 'pk/helper'
+require 'thor/group'
+
+module Pk
+  class Keys < Thor::Group
+    include Helper
+
+    desc "print public keys of members in a specific team"
+    argument :team, :type => :string, :desc => "Team name"
+    argument :members, :optional => true, :type => :string, :desc => "Members separated by comma (,)"
+
+    def self.banner
+      "#{basename} TEAM [MEMBER1,MEMBER2,..]"
+    end
+
+    def keys
+      init
+      member_list = members ? members.split(',').compact : all_members_of(team)
+      member_list.each do |member|
+        puts `cat ~/.pk/data/#{team}/#{member}`
+      end
+    end
+
+  end
+end

data/lib/pk/main.rb

@@ -0,0 +1,18 @@
+require 'thor'
+require 'pk/helper'
+require 'pk/team'
+require 'pk/keys'
+
+module Pk
+  class Main < Thor
+    include Helper
+
+    desc "keys TEAM [MEMBER1,MEMBER2,..]", "print public keys of members in a specific team"
+    def keys(team, members=nil)
+      Pk::Keys.start( [team, members] )
+    end
+
+    desc "team", "manage teams"
+    subcommand "team", Team
+  end
+end

data/lib/pk/team.rb

@@ -0,0 +1,39 @@
+require 'thor'
+require 'pk/helper'
+
+module Pk
+  class Team < Thor
+    include Helper
+
+    desc "add NAME, GIT_URL", "add team repo via git clone"
+    def add(name, git_url)
+      init
+      `git clone #{git_url} ~/.pk/data/#{name}`
+    end
+
+    desc "reload [TEAM]", "reload a team repo, or all teams if not specified"
+    def reload(team=nil)
+      init
+      teams = Dir["#{ENV["HOME"]}/.pk/data/*/"].map{|f| File.basename(f) }
+      teams = teams.select{|t| t == team} if team
+      teams.each do |t|
+        `cd ~/.pk/data/#{t} && git pull && cd -`
+      end
+    end
+
+    desc "list [TEAM]", "list all team, or team members if team is specified"
+    def list(team=nil)
+      init
+      if team
+        all_members_of(team).each do |m|
+          puts m
+        end
+      else
+        `ls ~/.pk/data`.split.each do |t|
+          puts t
+        end
+      end
+    end
+
+  end
+end

data/lib/pk/version.rb

@@ -1,3 +1,3 @@
 module Pk
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/pk.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_dependency "thor"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,13 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
-dependencies: []
+date: 2013-01-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Command line tool to collect and print public keys.
 email:
 - teohuiming@gmail.com
 executables:
 - pk
+- pkeys
 extensions: []
 extra_rdoc_files: []
 files:
@@ -25,7 +42,13 @@ files:
 - README.md
 - Rakefile
 - bin/pk
+- bin/pkeys
 - lib/pk.rb
+- lib/pk/helper.rb
+- lib/pk/ignore_file.rb
+- lib/pk/keys.rb
+- lib/pk/main.rb
+- lib/pk/team.rb
 - lib/pk/version.rb
 - pk.gemspec
 homepage: https://github.com/teohm/pk