usiri 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bffa41986da1febf0093238fbdf6b6e663438a9a
-  data.tar.gz: da5bfee35f6fd518106e1be981385ef0e00d502b
+  metadata.gz: 2c411920ad5ebcedbde652445b481525178895c9
+  data.tar.gz: af91e7d0b876bf56a343aaf14c0880e10df42bf6
 SHA512:
-  metadata.gz: aae629ee9171f942bcd0575d01fd5f2900e0b8c22aecc8e6c78c548039871d651f21b0fc713c7c84e952cfbc7172c9153b44bd2f396df283f0f53252c681e256
-  data.tar.gz: d574af8ea13cd59d7065bd3310f07fc352ff60cfe34d94e43a645335f8b011e5fceacc808cc0223c53b8e51ceea57165c9d6f9f6b0e9101858ec811732ff2243
+  metadata.gz: 3dc13f909a2786ad06dc98f4b862b7aa205af91c196422b4e010ed1a6583df030720562037244ca03de2c0ea8894a42406a9383c25e22e48893e2ebf9647f65d
+  data.tar.gz: 4d3a26d0feffc329d891d312d79a9dfb18e006b1711497e2a23d6983f9847dc38386e42d958b84e75dd0d830d443a2917e3714a293f793168a3972f3be26ebaa

data/README.md

@@ -1 +1,10 @@
-# usiri
+# usiri
+usiri [chaguo]
+
+    -j, --jina JINA                  jina itayotumwika kutengeneza siri
+    -s, --siti SITI                  siti itayotumwika kutengeneza siri
+    -a, --alama [AINA]               aina ya alama | moja katita [yoyote ,safi ,bila]
+    -u, --urefu UREFU                urefu wa siri. msingi: 23,  wastan wa chini: 16, wastan wa ju: 88
+    -t, --toleo TOLEO                toleo itayotumwika kutengeneza siri. msingi: 1.0
+    -m                               Oneysha mesegi hii
+    -T                               Oneysha toleo ya programu hii

data/lib/usiri.rb

@@ -1,7 +1,8 @@
 require 'digest'
 require 'clipboard'
+require 'usiri/IT'
 require 'usiri/msaidizi'
-
+require 'usiri/mwisho'
 
 module Usiri
   extend self
@@ -33,7 +34,8 @@ module Usiri
       tokeo = badilisha_maalama tokeo, kutoka, hashi
     end
 
-    copi_ila_ubao tokeo
+    copi_kwenye_ubao tokeo
+    kwaheri
   end
 
   def tengeneza_id
@@ -55,7 +57,7 @@ module Usiri
   end
 
   def ina_alama? neno
-    neno.match? ALAMA_REGEX
+    neno.match? REGEX[:alama]
   end
 
   def ni_alama? chr
@@ -76,7 +78,7 @@ module Usiri
   end
 
   def maalama
-    @alama == ALAMA_MSINGI ? alama_yoyote : alama_safi
+    @alama == MSINGI[:alama] ? alama_yoyote : alama_safi
   end
 
   def ju_chini
@@ -115,8 +117,12 @@ module Usiri
     herufu_tokeo.join
   end
 
-  def copi_ila_ubao siri
+  def copi_kwenye_ubao siri
     Clipboard.copy siri
-    puts MAELEZO[:siri_copiwa]
+  end
+
+  def kwaheri
+    IT.ondoa_line paka=1
+    puts MAELEZO[:siri_copiwa] + MAELEZO[:kwaheri]
   end
 end

data/lib/usiri/IT.rb

@@ -0,0 +1,14 @@
+require 'io/console'
+
+module IT
+  extend self
+  def letas ondoa = false
+    jibu = STDIN.noecho(&:gets)
+    ondoa_line if ondoa
+    jibu
+  end
+
+  def ondoa_line paka = 0
+    print "\r" + ("\e[A") * paka.abs() +"\e[J"
+  end
+end

data/lib/usiri/chaguo_cli.rb

@@ -36,37 +36,36 @@ class ChaguoCLI
     private
     def chaguo_jina mfasili
       mfasili.on("-j", "--jina JINA", MAELEZO[:jina]) do |jina|
-        raise kosa jina if jina.match? CHAGUO_CLI_REGEX
+        raise kosa jina if jina.match? REGEX[:chaguo_cli]
         @jina = jina
       end
     end
 
     def chaguo_siti mfasili
       mfasili.on("-s", "--siti SITI", MAELEZO[:siti]) do |siti|
-        raise kosa siti if siti.match? CHAGUO_CLI_REGEX
+        raise kosa siti if siti.match? REGEX[:chaguo_cli]
         @siti = siti
       end
     end
 
     def chaguo_alama mfasili
-      mfasili.on("-a", "--alama [AINA]", AINA_MAALAMA,
-        MAELEZO[:alama]) do |alama|
+      mfasili.on("-a", "--alama [AINA]", AINA_MAALAMA, MAELEZO[:alama]) do |alama|
         if AINA_MAALAMA.include? alama
           @alama = alama
         else
-          @alama = ALAMA_MSINGI
+          @alama = MSINGI[:alama]
         end
       end
     end
 
     def chaguo_urefu mfasili
-      mfasili.on("-u", "--urefu UREFU", UREFU_REGEX, MAELEZO[:urefu]) do |urefu|
+      mfasili.on("-u", "--urefu UREFU", REGEX[:urefu], MAELEZO[:urefu]) do |urefu|
         @urefu = urefu.to_i
       end
     end
 
     def chaguo_toleo mfasili
-      mfasili.on("-t", "--toleo TOLEO", TOLEO_REGEX, MAELEZO[:toleo]) do |toleo|
+      mfasili.on("-t", "--toleo TOLEO", REGEX[:toleo], MAELEZO[:toleo]) do |toleo|
         @toleo = toleo
       end
     end

data/lib/usiri/msaidizi.rb

@@ -1,6 +1,7 @@
 require 'optparse'
 require 'usiri/chaguo_cli'
 require 'usiri/muombi'
+require 'usiri/mwisho'
 
 module Msaidizi
   extend self
@@ -47,6 +48,11 @@ module Msaidizi
   end
 
   def omba_chaguo_kama_hazipo chaguo_asili
-    Muombi.new chaguo_asili
+    begin
+      Muombi.new chaguo_asili
+    rescue SystemExit, Interrupt
+      puts MAELEZO[:kwaheri]
+      exit
+    end
   end
 end

data/lib/usiri/muhakikisha.rb

@@ -7,10 +7,10 @@ module Muhakikisha
   end
 
   def urefu u
-    u.match? UREFU_REGEX
+    u.match? REGEX[:urefu]
   end
 
   def toleo t
-    t.match? TOLEO_REGEX
+    t.match? REGEX[:toleo]
   end
 end

data/lib/usiri/muombi.rb

@@ -1,27 +1,58 @@
-require 'io/console'
 require "inquirer"
-require "usiri/mwisho"
 require "usiri/muhakikisha"
+require "usiri/it"
+require "usiri/mwisho"
 
 class Muombi
     attr_accessor :jina, :siti, :siri, :alama, :urefu, :toleo
 
     def initialize(chaguo_asili)
-      @jina = leta_chaguo chaguo_asili, :jina, 'JINA_USIRI'
-      @siti = leta_chaguo chaguo_asili, :siti
-      @siri = leta_chaguo chaguo_asili, :siri
-      @alama = leta_chaguo chaguo_asili, :alama
-      @urefu = leta_chaguo(chaguo_asili, :urefu).to_i
-      @toleo = leta_chaguo chaguo_asili, :toleo
+      karibu
+      leta_chaguo_id chaguo_asili
+      leta_chaguo_siri chaguo_asili
     end
 
     private
-    def leta_chaguo chaguo_asili, chaguo, jina_env = nil
+    def karibu
+      puts MAELEZO[:karibu]
+    end
+
+    def leta_chaguo_id chaguo_asili
+      [:jina, :siti, :siri].each do |chaguo|
+        setti_chaguo chaguo, leta_chaguo(chaguo_asili, chaguo, ENVI[chaguo])
+      end
+    end
+
+    def leta_chaguo_siri chaguo_asili
+      hazijasetiwa = [];
+
+      MSINGI.each do |jina_chaguo, thamani|
+        if chaguo_haijasetiwa? chaguo_asili, jina_chaguo
+          hazijasetiwa.push jina_chaguo
+        else
+          thamani = leta_chaguo chaguo_asili, jina_chaguo
+          setti_chaguo jina_chaguo, thamani
+        end
+      end
+
+      maamuzi = omba_chaguo_siri hazijasetiwa.map { |e| "#{e}: #{MSINGI[e]}" }
+
+      hazijasetiwa.each_with_index do |chaguo, sehemu|
+        amekubali_msingi = maamuzi[sehemu]
+        if amekubali_msingi
+          setti_chaguo chaguo, MSINGI[chaguo]
+        else
+          setti_chaguo chaguo, leta_chaguo(chaguo_asili, chaguo)
+        end
+      end
+    end
+
+    def leta_chaguo chaguo_asili, chaguo, env = nil
       jibu = leta_chaguo_asili chaguo_asili, chaguo
 
       if jibu.nil?
-        if not jina_env.nil?
-          jibu = ENV[jina_env]
+        if not env.nil?
+          jibu = ENV[env]
         else
           muhakikisha = tengeneza_muhakikisha chaguo
           jibu = omba chaguo
@@ -34,7 +65,20 @@ class Muombi
         end
       end
 
-      jibu
+      chaguo == :urefu ? jibu.to_i : jibu
+    end
+
+    def setti_chaguo chaguo, thamani
+      setta = leta_setta chaguo
+      self.method(setta).call(thamani)
+    end
+
+    def leta_setta chaguo
+      (chaguo.to_s + "=").to_sym
+    end
+
+    def chaguo_haijasetiwa? chaguo_asili, chaguo
+      leta_chaguo_asili(chaguo_asili, chaguo).nil?
     end
 
     def leta_chaguo_asili chaguo_asili, chaguo
@@ -94,23 +138,23 @@ class Muombi
 
       case chaguo
       when :urefu
-        opts[:default] = UREFU_MSINGI.to_s
+        opts[:default] = MSINGI[:urefu].to_s
       when :toleo
-        opts[:default] = TOLEO_MSINGI.to_s
+        opts[:default] = MSINGI[:toleo].to_s
       end
+
       opts
     end
 
     def omba_siri swala
-        # swala = "Ingiza siri ku: "
-        # swala = "#{MAELEZO[:jaribu_tena]} " + swala if kosa
-        print swala
-        ingizo = STDIN.noecho(&:gets).strip
-        clear_line
-        ingizo
+      print swala
+      IT.letas(ondoa=true).strip
     end
 
-    def clear_line
-      print "\r\e[0K"
+    def omba_chaguo_siri msingi
+      Ask.checkbox(MAELEZO[:chaguo_siri],
+                    msingi,
+                    default: msingi.map { |e| true },
+                    response: false)
     end
 end

data/lib/usiri/mwisho.rb

@@ -1,25 +1,41 @@
 require "colorize"
 
+MSINGI = {
+  alama: :yoyote,
+  urefu: 23,
+  toleo: 1.0
+}
+
+ENVI = {
+  jina: "JINA_USIRI"
+}
+
+AINA_MAALAMA = [MSINGI[:alama], :safi, :bila]
 UREFU_WASTAN_CHINI = 16
 UREFU_WASTAN_JU = 88
-UREFU_MSINGI = 23
-UREFU_REGEX = /^[1-7][6-9]$|^[2-7][0-9]$|^8[0-8]$/
-TOLEO_MSINGI = 1.0
-TOLEO_REGEX = /^-?[\d]+\.?[\d]*$/
-ALAMA_MSINGI = :yoyote
-ALAMA_REGEX = /[\W_]/
-AINA_MAALAMA = [ALAMA_MSINGI, :safi, :bila]
-CHAGUO_CLI_REGEX = /^-[jsautTm]$|^--jina$|^--siti$|^--alama$|^--urefu$|^--toleo$/
+
+REGEX = {
+  urefu: /^[1-7][6-9]$|^[2-7][0-9]$|^8[0-8]$/,
+  toleo: /^-?[\d]+\.?[\d]*$/,
+  alama: /[\W_]/,
+  chaguo_cli: /^-[jsautTm]$|^--jina$|^--siti$|^--alama$|^--urefu$|^--toleo$/
+}
+
 MAELEZO = {
+  karibu: ("👐🏾 "+" Karibu!").black.on_yellow +
+          " Ingiza au chagua chaguozako alafu bonyeza 'enter' kuendelea".green,
   jina: "jina itayotumwika kutengeneza siri",
   siti: "siti itayotumwika kutengeneza siri",
   siri: "siri ku: ",
-  alama: "aina ya alama | moja katita [#{AINA_MAALAMA.join(" ,")}]",
-  urefu: "urefu wa siri. msingi: #{UREFU_MSINGI},\
+  chaguo_siri: "tumiya chaguo haya kutengeneza siri."+
+                " Bonyeza 'spacebar' kukubali aw kukataa chaguo.",
+  alama: "aina ya alama | moja katita [#{AINA_MAALAMA.join(' ,')}]",
+  urefu: "urefu wa siri. msingi: #{MSINGI[:urefu]},\
   wastan wa chini: #{UREFU_WASTAN_CHINI}, wastan wa ju: #{UREFU_WASTAN_JU}",
-  toleo: "toleo itayotumwika kutengeneza siri. msingi: #{TOLEO_MSINGI}",
+  toleo: "toleo itayotumwika kutengeneza siri. msingi: #{MSINGI[:toleo]}",
   msaada: "Oneysha mesegi hii",
   toleo_usiri: "Oneysha toleo ya programu hii",
   jaribu_tena: "**JARIBU TENA**".black.on_red,
-  siri_copiwa: "Siri ime copiwa kwenye ubao".green
+  siri_copiwa: "🙌🏾 "+ " Siri ime copiwa kwenye ubao. Karibu tena! ".green,
+  kwaheri: "Kwaheri".green + " ✌🏾"
 }

data/lib/usiri/toleo.rb

@@ -1,3 +1,3 @@
 module Usiri
-  TOLEO = "1.0.0"
+  TOLEO = "2.0.0"
 end

data/usiri.gemspec

@@ -4,16 +4,17 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "usiri/toleo"
 
 Gem::Specification.new do |spec|
-  spec.name           = 'usiri'
-  spec.version        = Usiri::TOLEO
-  spec.executables    << 'usiri'
-  spec.date           = '2017-10-24'
-  spec.summary        = "Manega ya maneno ya siri"
-  spec.description    = "Hii ni programu raisi ya ku hifadhi maneno ya siri"
-  spec.authors        = ["Itenga"]
-  spec.email          = 'itenga@protonmail.com'
-  spec.files          = `git ls-files`.split("\n")
-  spec.require_paths  = ["lib"]
-  spec.homepage       = 'https://github.com/msukuma/usiri'
-  spec.license        = 'MIT'
+  spec.name                   = 'usiri'
+  spec.version                = Usiri::TOLEO
+  spec.executables            << 'usiri'
+  spec.date                   = '2017-10-24'
+  spec.summary                = "Manega ya maneno ya siri"
+  spec.description            = "Hii ni programu raisi ya ku hifadhi maneno ya siri"
+  spec.authors                = ["Itenga"]
+  spec.email                  = 'itenga@protonmail.com'
+  spec.files                  = `git ls-files`.split("\n")
+  spec.require_paths          = ["lib"]
+  spec.required_ruby_version  = '>=2.4.0'
+  spec.homepage               = 'https://github.com/msukuma/usiri'
+  spec.license                = 'MIT'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usiri
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Itenga
@@ -25,6 +25,7 @@ files:
 - Rakefile
 - bin/usiri
 - lib/usiri.rb
+- lib/usiri/IT.rb
 - lib/usiri/chaguo_cli.rb
 - lib/usiri/msaidizi.rb
 - lib/usiri/muhakikisha.rb
@@ -44,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="