genebrand 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df886dded27853f7233c3e615615ae61b24b4409
-  data.tar.gz: d27b850978b442777f453213b6e9126982d4d001
+  metadata.gz: 46d12688311439cc6f87889a4de0fd957a88c0e2
+  data.tar.gz: ec085f97ad2dae418f50c73969cd12f18bd083c7
 SHA512:
-  metadata.gz: 8751baa6020403a0dfc32677ed3d913f58befc55589989018880265ee307917084a4ae9d42fcca3226596ccdeac15d2bc8d0e755fdea638311232055d9be230b
-  data.tar.gz: 211b885c81cfbeaabaa7a85bc326d1d256f412ab7a751b96c55723e1e4c8ac332e1dd24bc93b9856a96e5b22265e2e399e66ad86d67802c6be66281d6529e428
+  metadata.gz: 9ca1f24cbc8157fd7ba8e0fc0e2f1167eddacebea69ac007ac1bf6f5ce0a4048aee3d9fe1292e84d9386b6ed79bc25fd5d22bde8bc7c6fb36ef609c1d11a7f99
+  data.tar.gz: 7ba12960fbc7becf1683314fd90e0855a378aad0abe868df369d882d27db5fc067d904efd7a894663383459224affaeeb8aff789214b20f64f73cbaed72950d1

data/README.md

@@ -1,8 +1,9 @@
-# Genebrand
-
 [![Code Climate](https://codeclimate.com/github/andreyviktorov/genebrand/badges/gpa.svg)](https://codeclimate.com/github/andreyviktorov/genebrand)
+[![Inline docs](http://inch-ci.org/github/andreyviktorov/genebrand.png)](http://inch-ci.org/github/andreyviktorov/genebrand)
+
+# Genebrand
 
-CLI brand names generator
+CLI brand names generator with auto domain availability check
 
 ## Installation
 
@@ -24,21 +25,28 @@ And then execute:
 
 And follow instructions
 
-## Contributing
+## Features
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/andreyviktorov/genebrand. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+* Whois
+* Easy to use filters
+* Several word packs
 
+## Donate
 
-## License
+Support further development with donation
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+Bitcoin:
 
-## TODO
+**1EoaB8uSnXEfgE3XUZafNs8aETEqdRppku**
 
-* Whois
+Yandex.Money:
+
+**410013115721646**
+
+## Contributing
 
-* Using word tops for seeding
+Bug reports and pull requests are welcome on GitHub at https://github.com/andreyviktorov/genebrand. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
-* Write tests
+## License
 
-* Refactor `generator.rb`
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -17,14 +17,14 @@ end
 
 task :seed do
   require './lib/genebrand/posparser.rb'
-  puts "May (and will) take a while"
-  puts "Parsing all data"
+  puts 'May (and will) take a while'
+  puts 'Parsing all data'
   parser = Genebrand::PosParser.new
   parser.parseandsave('seed/preseed.txt', 'lib/data/posinfo.json')
 
-  puts "Parsing with top 100k"
+  puts 'Parsing with top 100k'
   parser.parseandsave_top('seed/preseed.txt', 'seed/100k.txt', 'lib/data/pos100k.json')
 
-  puts "Parsing with top 10k"
+  puts 'Parsing with top 10k'
   parser.parseandsave_top('seed/preseed.txt', 'seed/10k.txt', 'lib/data/pos10k.json')
 end

data/exe/genebrand

@@ -3,7 +3,7 @@ STDOUT.sync = true
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w(.. lib))
 
-trap("SIGINT") { exit! }
+trap('SIGINT') { exit! }
 
 require 'genebrand'
 require 'mercenary'

data/genebrand.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Genebrand is a small brands generator'
   spec.description   = 'CLI brand names generator'
-  spec.homepage      = 'https://github.com/andreyviktorov/genebrand'
+  spec.homepage      = 'https://github.com/4ndv/genebrand'
   spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

data/lib/genebrand/commands/new.rb

@@ -37,22 +37,27 @@ module Genebrand
               menu.prompt = 'What should we add?'.yellow
 
               menu.choice('String') do
-                brand.push(type: :word,
-                           word: ask('Enter word (English, no spaces and punctiation, 1-10 symbols)')) do |q|
-                  q.validate = /\A[a-zA-Z\d]{1,10}\z/
-                end
+                str = { type: :word, word: ask('Enter word (English, no spaces and punctiation, 1-10 symbols)') { |q| q.validate = /\A[a-zA-Z\d]{1,10}\z/ } }
+                brand.push(str)
                 puts
               end
 
               menu.choice('Specific part of speech') { brand.push(pickpart) }
 
-              if brand.length > 1
+              if brand.length > 0
                 menu.choice('Enough, show me some brands!') { throw :parts_done }
               end
             end
           end
         end
 
+        choose do |menu|
+          menu.prompt = 'Check domain availability?'.yellow
+
+          menu.choice('Yes')
+          menu.choice('No') { @gen.nowhois = true }
+        end
+
         @gen.generate(brand)
       end
 

data/lib/genebrand/generator.rb

@@ -3,133 +3,158 @@ module Genebrand
     require 'resolv'
 
     attr_reader :words
+    attr_accessor :nowhois
 
     def initialize(filename)
       @words = JSON.parse(File.read(File.join(Gem::Specification.find_by_name('genebrand').gem_dir, "lib/data/#{filename}")))
+      @filtername = {
+        minlen: 'Minimum length:',
+        maxlen: 'Maximum length:',
+        starts: 'Starts with:',
+        ends: 'Ends with:',
+        contains: 'Contains:'
+      }
     end
 
-    def prettyoutput(domain)
-      data = '['
-
-      # A bit hacky, but pretty fast method to guess domain available or not
+    def is_available?(domain, zone)
       resolv = Resolv::DNS.open
-      data << (resolv.getresources("#{domain}.com", Resolv::DNS::Resource::IN::NS).count == 0 ? "com".green : "com".red)
-      data << ' '
-      data << (resolv.getresources("#{domain}.net", Resolv::DNS::Resource::IN::NS).count == 0 ? "net".green : "net".red)
-      data << ' '
-      data << (resolv.getresources("#{domain}.org", Resolv::DNS::Resource::IN::NS).count == 0 ? "org".green : "org".red)
-      data << "]\t"
+      resolv.getresources("#{domain}.#{zone}", Resolv::DNS::Resource::IN::NS).count == 0
+    end
+
+    def prettyoutput(domain)
+      data = ''
+      unless @nowhois
+        # A bit hacky, but pretty fast method to guess domain available or not
+        resolv = Resolv::DNS.open
+        com = is_available?(domain, 'com') ? 'com'.green : 'com'.red
+        net = is_available?(domain, 'net') ? 'net'.green : 'net'.red
+        org = is_available?(domain, 'org') ? 'org'.green : 'org'.red
+        data = "[#{com} #{net} #{org}]\t"
+      end
       data << domain.bold
 
-      return data
+      data
     end
 
-    def generate(info)
-      out = []
-
+    def getinfo(info)
       puts
       puts 'Generating brands with these parameters:'.cyan
       puts
-      i = 1
+      i = 0
 
       info.each do |item|
         if item[:type] == :word
-          puts "#{i}. Word: #{item[:word]}".green
+          puts "#{i += 1}. Word: #{item[:word]}".green
         elsif item[:type] == :part
-          puts "#{i}. Part of speech: #{item[:part]}".green
+          puts "#{i += 1}. Part of speech: #{item[:part]}".green
           puts 'Filters:'
-          item[:filters].each do |filter, value|
-            if filter == :minlen
-              puts "Minimum length: #{value}"
-            elsif filter == :maxlen
-              puts "Maximum length: #{value}"
-            elsif filter == :starts
-              puts "Starts with: #{value}"
-            elsif filter == :ends
-              puts "Ends with: #{value}"
-            elsif filter == :contains
-              puts "Contains: #{value}"
-            end
+          item[:filters].each do |filter, _value|
+            puts "#{@filtername[filter]} #{_value}"
           end
         end
+      end
+    end
 
-        i += 1
+    def filter(parts, filter, value)
+      case filter
+      when :minlen
+        parts = parts.select { |i| i[/^.{#{value},}$/] }
+      when :maxlen
+        parts = parts.select { |i| i[/^.{,#{value}}$/] }
+      when :starts
+        parts = parts.select { |i| i[/^#{value}.*$/i] }
+      when :ends
+        parts = parts.select { |i| i[/^.*#{value}$/i] }
+      when :contains
+        parts = parts.select { |i| i[/^.*(#{value}).*$/i] }
       end
+      parts
+    end
 
-      puts
-      puts 'Press any key to continue'.cyan
-      puts
+    def applyfilters(item)
+      parts = @words[item[:part]]
+      item[:filters].each do |filter, value|
+        parts = filter(parts, filter, value)
+      end
 
-      puts 'Fetching variants...'
+      parts
+    end
+
+    def prepareparts(info)
       gener = []
-      wordscount = 0
+      puts 'Fetching variants...'
       info.each do |item|
         if item[:type] == :word
-          wordscount += 1
           gener.push(item[:word])
         elsif item[:type] == :part
-          parts = @words[item[:part]]
-          item[:filters].each do |filter, value|
-            if filter == :minlen
-              parts = parts.select { |i| i[/^.{#{value},}$/] }
-            elsif filter == :maxlen
-              parts = parts.select { |i| i[/^.{,#{value}}$/] }
-            elsif filter == :starts
-              parts = parts.select { |i| i[/^#{value}.*$/i] }
-            elsif filter == :ends
-              parts = parts.select { |i| i[/^.*#{value}$/i] }
-            elsif filter == :contains
-              parts = parts.select { |i| i[/^.*(#{value}).*$/i] }
-            end
-          end
-
+          parts = applyfilters(item)
           if parts.count > 0
             gener.push(parts)
           else
-            Genebrand::Logger.warning "0 variants for that part, will be skipped"
+            Genebrand::Logger.warning '0 variants for that part, will be skipped'
           end
         end
       end
 
-      approx = 1
+      gener
+    end
 
-      gener.each do |item|
+    def generateone(gener)
+      itemd = ''
+
+      gener.each_with_index do |item, index|
         if item.is_a? Array
-          approx *= item.count
+          ind = rand(gener[index].count)
+          itemd << gener[index][ind].capitalize
+        else
+          itemd << gener[index].capitalize
         end
       end
 
-      #arrdata.reverse!
-
-      puts 'Available variants: '.yellow + approx.to_s.bold
-      puts
-
-      puts "Whois info\tBrand"
+      itemd
+    end
 
-      finish = false
+    def proceedgen(gener)
       i = 0
-      while not finish
-        itemd = ''
-
-        gener.each_with_index do |item, index|
-          if item.is_a? Array
-            ind = rand(gener[index].count)
-            itemd << gener[index][ind].capitalize
-          else
-            itemd << gener[index].capitalize
-          end
-        end
-
+      loop do
+        itemd = generateone(gener)
         puts prettyoutput(itemd)
 
         i += 1
 
-        if i%15 == 0
+        if i % 15 == 0
           puts
-          puts "Press any key to see next variants".cyan
+          puts 'Press any key to see next variants'.cyan
           gets
         end
       end
     end
+
+    def countvariants(gener)
+      approx = 1
+
+      gener.each do |item|
+        approx *= item.count if item.is_a? Array
+      end
+
+      puts 'Available variants: '.yellow + approx.to_s.bold
+      puts
+    end
+
+    def generate(info)
+      getinfo(info)
+
+      gener = prepareparts(info)
+
+      countvariants(gener)
+
+      if @nowhois
+        puts 'Brand'
+      else
+        puts "Whois info\tBrand"
+      end
+
+      proceedgen(gener)
+    end
   end
 end

data/lib/genebrand/posparser.rb

@@ -3,11 +3,8 @@ module Genebrand
     require 'json'
     require 'fileutils'
 
+    # Fills parts of speech table
     def initialize
-      init
-    end
-
-    def init
       @parsed = {}
       @table = {}
       # Сущ
@@ -22,6 +19,10 @@ module Genebrand
       @table['A'] = @parsed['adj'] = []
     end
 
+    # Parses file of word\tpartofspeech
+    #
+    # @param [String] filename that should be parsed
+    # @return [Hash] of partofspeech => words
     def parse(filename)
       init
 
@@ -30,18 +31,22 @@ module Genebrand
         return
       end
 
-      puts "Seeding"
+      puts 'Seeding'
       File.open(filename, 'r').each_line do |line|
         data = line.split("\t")
 
-        data[1].split('').each do |partofsp|
-          @table[partofsp].push(data[0].downcase) if @table.key?(partofsp)
-        end
+        getparts(data)
       end
 
       @parsed
     end
 
+    def getparts(data)
+      data[1].split('').each do |partofsp|
+        @table[partofsp].push(data[0].downcase) if @table.key?(partofsp)
+      end
+    end
+
     def parse_top(filename, top)
       init
 
@@ -50,27 +55,21 @@ module Genebrand
         return
       end
 
-      puts "Load top"
+      puts 'Load top'
       toparr = []
       File.open(top, 'r').each_line do |line|
         toparr << line.strip.downcase
       end
       puts toparr.count
 
-      puts "Seeding"
+      puts 'Seeding'
       it = 0
       File.open(filename, 'r').each_line do |line|
         data = line.split("\t")
 
-        if toparr.include?(data[0])
-          data[1].split('').each do |partofsp|
-            @table[partofsp].push(data[0].downcase) if @table.key?(partofsp)
-          end
-        end
-        it+=1
-        if it % 10000 == 0
-          puts it
-        end
+        getparts(data) if toparr.include?(data[0])
+        it += 1
+        puts it if it % 10_000 == 0
       end
 
       @parsed
@@ -86,7 +85,7 @@ module Genebrand
         return
       end
 
-      puts "Preseed"
+      puts 'Preseed'
       File.open(filename, 'r').each_line do |line|
         data = line.split("\t")
 

data/lib/genebrand/version.rb

@@ -1,3 +1,3 @@
 module Genebrand
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genebrand
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrey Viktorov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -109,7 +109,7 @@ files:
 - lib/genebrand/logger.rb
 - lib/genebrand/posparser.rb
 - lib/genebrand/version.rb
-homepage: https://github.com/andreyviktorov/genebrand
+homepage: https://github.com/4ndv/genebrand
 licenses:
 - MIT
 metadata: