sugoi_aliases_updator 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651a43af710f321e0a4a10251dc1d8aa6f34167a
-  data.tar.gz: d5ab8f718963783a448baf3b39ff8192734526b4
+  metadata.gz: 1a8fd7f2e2371f690b1262b089b4677ef67a3332
+  data.tar.gz: 94b92664db4db779b58b09a788948b71bb0e8533
 SHA512:
-  metadata.gz: 277055d73fee343d2e0456334522a0c372846e8ace4818b027683528d84b57233f63c7918f393a1f00e493a2a345cf2756b08d269be0db234c779843b872799d
-  data.tar.gz: 2c251ec50a00f39cdd5455464cb774e6217ff9fe7c1dd038d90ebe53c21184db60fb691e3c27d52f7a0bc1919ff3de5e27cbe1f910c1389732d80feafcff1336
+  metadata.gz: 576863837762a3d56d7e7188c659c1b89f8422df17a0b652b6cd4aecf7d189f571ac302d49a1c00d36894864c6691ad75ec674608521853b39dfe73c392065e8
+  data.tar.gz: f324fbae5f5b02433f80466955a77c9e50a2aa404e5a3283518ff8027fd05701f4a395c54731c5f931714620e25e71cc4a8c5bf46f5be5cf91c16e7edce8adf9

data/README.md

@@ -12,7 +12,7 @@ gem 'sugoi_aliases_updator'
 'ruby' >= '2.1'
 
 ## Usage
-add, rm, listのみ。
+add, rm(del), list(show)のみ。
 ```
 $ cat /etc/aliases
 www:            root, n905i.1214@gmail.com
@@ -28,7 +28,7 @@ postfix:        root, n905i.1214@gmail.com
 ```
 
 ```
-$ sugoi_aliases_updator /etc/aliases rm n905i.1214@gmail.com TO=www,postfix
+$ sugoi_aliases_updator /etc/aliases rm n905i.1214@gmail.com FROM=www,postfix
 www:            root
 ftp-bugs:       root
 postfix:        root

data/exe/sugoi_aliases_updator

@@ -1,50 +1,18 @@
 #!/usr/bin/env ruby
 
-COMMANDS = %w(add rm list)
-
-filepath =         ARGV[0] || ''
-command =          ARGV[1]
-target_email =     ARGV[2]
-direction_labels = ARGV[3]
-
-if $*.first == '--version'
-  require "sugoi_aliases_updator/version"
-  puts SugoiAliasesUpdator::VERSION
-  exit 0
-end
-
-unless File.exists?(filepath)
-  puts "file is not found "
-  exit 1
-end
-
-unless COMMANDS.include?(command)
-  puts "input (#{COMMANDS.join("|")})"
-  exit 1
-end
-
-unless /\w*@.*/ =~ target_email
-  puts "input email"
-  exit 1
-end
+require "sugoi_aliases_updator"
 
-if %w(add rm).include?(command) && direction_labels.nil?
-  need = { 'add' => 'TO', 'rm' => 'FROM' }
-  puts "Usage: #{need[command]}=label1,label2"
-  exit 1
-end
+cli = SugoiAliasesUpdator::Cli.new(ARGV)
+cli.check_input
 
-require "sugoi_aliases_updator"
 include SugoiAliasesUpdator
-aliases_parser = AliasesParser.new(filepath)
+aliases_parser = AliasesParser.new(cli.filepath)
 
-case command
+case cli.command
 when 'add'
-  labels = AliasesParser.parse_direction_labels(direction_labels)
-  puts aliases_parser.add(target_email, to: labels)
-when 'rm'
-  labels = AliasesParser.parse_direction_labels(direction_labels)
-  puts aliases_parser.rm(target_email, from: labels)
-when 'list'
-  puts aliases_parser.list(target_email)
+  puts aliases_parser.add(cli.target_email, cli.direction_labels)
+when 'rm', 'del'
+  puts aliases_parser.rm(cli.target_email, cli.direction_labels)
+when 'list', 'show'
+  puts aliases_parser.list(cli.target_email)
 end

data/lib/sugoi_aliases_updator.rb

@@ -1,4 +1,5 @@
 require "sugoi_aliases_updator/line_parser"
+require "sugoi_aliases_updator/cli"
 require "sugoi_aliases_updator/aliases_parser"
 
 module SugoiAliasesUpdator

data/lib/sugoi_aliases_updator/aliases_parser.rb

@@ -3,17 +3,12 @@ module SugoiAliasesUpdator
 
     attr_accessor :changed_labels
 
-    def self.parse_direction_labels(string)
-      raise("Oops '#{string}'") unless /(TO|FROM)=(.*)$/ =~ string
-      $2.split(/,\s?/)
-    end
-
     def initialize(filepath)
       @native_lines = File.readlines(filepath)
       @changed_labels = []
     end
 
-    def add(target_email, to: )
+    def add(target_email, to)
       check_labels!(to)
       to.each do |x|
         unless label_mails_hash[x].include?(target_email)
@@ -24,7 +19,7 @@ module SugoiAliasesUpdator
       render!
     end
 
-    def rm(target_email, from: )
+    def rm(target_email, from)
       if ['ALL'] == from
         label_mails_hash.each do |label, emails|
           if emails.include?(target_email)

data/lib/sugoi_aliases_updator/cli.rb

@@ -0,0 +1,63 @@
+module SugoiAliasesUpdator
+  class Cli
+    attr_reader :filepath, :target_email, :command
+
+    COMMANDS = %w(add rm del list show)
+
+    def initialize(args)
+      @filepath =         args[0] || ''
+      @command =          args[1]
+      @target_email =     args[2]
+      @direction_labels = args[3]
+    end
+
+    def check_input
+      display_version
+      check_filepath
+      check_command
+      check_terget_email
+      check_direction
+    end
+
+    def direction_labels
+      raise("Oops '#{@direction_labels}'") unless /(TO|FROM)=(.*)$/ =~ @direction_labels
+      $2.split(/,\s?/)
+    end
+
+    private
+
+    def display_version
+      return unless @filepath == '--version'
+      require "sugoi_aliases_updator/version"
+      puts SugoiAliasesUpdator::VERSION
+      exit 0
+    end
+
+    def check_filepath
+      return if File.exists?(@filepath)
+      puts "file is not found "
+      exit 1
+    end
+
+    def check_command
+      return if COMMANDS.include?(@command)
+      puts "input (#{COMMANDS.join("|")})"
+      exit 1
+    end
+
+
+    def check_terget_email
+      return if /\w*@.*/ =~ @target_email
+      puts "input email"
+      exit 1
+    end
+
+    def check_direction
+      if %w(add rm).include?(@command) && @direction_labels.nil?
+        need = { 'add' => 'TO', 'rm' => 'FROM' }
+        puts "Usage: #{need[@command]}=label1,label2"
+        exit 1
+      end
+    end
+  end
+end

data/lib/sugoi_aliases_updator/version.rb

@@ -1,3 +1,3 @@
 module SugoiAliasesUpdator
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sugoi_aliases_updator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - exe/sugoi_aliases_updator
 - lib/sugoi_aliases_updator.rb
 - lib/sugoi_aliases_updator/aliases_parser.rb
+- lib/sugoi_aliases_updator/cli.rb
 - lib/sugoi_aliases_updator/line_parser.rb
 - lib/sugoi_aliases_updator/version.rb
 - sugoi_aliases_updator.gemspec
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: "/etc/aliases uppdator."