rumm 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97357391b81a9c9f37e2580228e2009b11d64df4
-  data.tar.gz: 8b0dd6acd5dd5a33674d4f41705296dcd6fa29d7
+  metadata.gz: cc24108bd8cdec93e429a103d5c862b94c6d1039
+  data.tar.gz: f9effd84d6c5826a06c2eb03abafe04da5c91918
 SHA512:
-  metadata.gz: a509e66c8057eb5fa97117d30b02c5dd425a4ebec5cd1b3cedbe49af07f0f7c3e2828e84ad8100d79ce3ef15cb55f9f5494c5cb0f0944cd5873c1958a37e40c4
-  data.tar.gz: fd7042e235e672fb6da464918585bf6b19424ab6203d2c6ad289b7171f2cb85685c99f1f376bad637ef579a4803cc85222994d6510588136f0505b0eebcf1c62
+  metadata.gz: a86d6cb0234bff1c0622330b924b7c86f7226037ad29b613f077844ae2537755e3c42e39c179082b5b8799a5f7abf0b4d8c566f71a6cbbcb6beed4e88d75eac5
+  data.tar.gz: 480d7bde974beeb5b16170846ef7fbe8bccc4e64ce5ae030c2ae63f4260997216b37f97ac391a9fb859c741f3eaa8c7f0ed88d7b00b2187aa33500dda78c468b

data/README.md

@@ -22,7 +22,7 @@ Authenticate with rackspace
 Now we can see the list of servers we have available:
 
     $ rumm show servers
-    you don't have any servers, but you can create on with:
+    you don't have any servers, but you can create one by running:
     rumm create server
 
 Create the server:

data/Rakefile

@@ -4,3 +4,30 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+desc "build the list of names and pack it into a pstore"
+task "names:build" do
+  require "pstore"
+  adjective_file = File.expand_path "../app/providers/naming/adj.txt", __FILE__
+  noun_file = File.expand_path "../app/providers/naming/nouns.txt", __FILE__
+  PStore.new(File.expand_path("../app/providers/naming/dictionary.pstore", __FILE__)).tap do |store|
+    store.transaction do
+      adjectives = store["adjectives"] = {}
+      File.open(adjective_file) do |file|
+        file.each_line do |line|
+          first_letter = line[0]
+          adjectives[first_letter] ||= []
+          adjectives[first_letter] << line.chomp
+        end
+      end
+      nouns = store["nouns"] = {}
+      File.open(noun_file) do |file|
+        file.each_line do |line|
+          first_letter = line[0]
+          nouns[first_letter] ||= []
+          nouns[first_letter] << line.chomp
+        end
+      end
+    end
+  end
+end

data/app/providers/naming_provider.rb

@@ -1,106 +1,37 @@
+require "pstore"
+
 class NamingProvider
 
   def value
     self
   end
 
-  def generate_name adj, noun
-    if adj == nil and noun == nil
-      get_adj + "-" + get_noun
-    else
-      get_adj_bound(adj) + "-" + get_noun_bound(noun)
-    end
+  def generate_name(first_letter = random_letter, last_letter = random_letter)
+    "#{adjective first_letter}-#{noun last_letter}"
+  end
+
+  def random_letter
+    ('a'..'z').to_a.shuffle.first
   end
 
   private
 
-  def get_adj
-    a = rand(20748)
-    counter = 0
-    dict = File.new(File.expand_path "../naming/adj.txt", __FILE__)
-    dict.each_line do |line|
-      if counter == a
-        return line.delete("\n")
-      end
-      counter+=1
-    end
+  def dictionary(key)
+    @dictionary ||= PStore.new dictionary_file
+    @dictionary.transaction(true) { @dictionary[key] }
   end
 
-  def get_noun
-    a = rand(50432)
-    counter = 0
-    dict = File.new(File.expand_path "../naming/nouns.txt", __FILE__)
-    dict.each_line do |line|
-      if counter == a
-        return line.delete("\n")
-      end
-      counter+=1
-    end
+  def dictionary_file
+    File.expand_path '../naming/dictionary.pstore', __FILE__
   end
 
-  def get_adj_bound letter
-    higher = true
-    upper = 20748
-    lower = 0
-    a = 0
-    word = ""
-    done = false
-    until done
-      if higher
-        lower = a
-      else
-        upper = a
-      end
-      a = rand lower..upper
-      counter = 0
-      dict = File.new(File.expand_path "../naming/adj.txt", __FILE__)
-      dict.each_line do |line|
-        if counter == a
-          word = line.delete("\n")
-          break
-        end
-        counter+=1
-      end
-      if word[0] == letter
-        return word
-      elsif word[0] <= letter
-        higher = true
-      else
-        higher = false
-      end
-    end
+  def noun(first_letter)
+    list = dictionary('nouns')[first_letter]
+    list[rand(list.length - 1)]
   end
 
-  def get_noun_bound letter
-    higher = true
-    upper = 50432
-    lower = 0
-    a = 0
-    word = ""
-    done = false
-    until done
-      if higher
-        lower = a
-      else
-        upper = a
-      end
-      a = rand lower..upper
-      counter = 0
-      dict = File.new(File.expand_path "../naming/nouns.txt", __FILE__)
-      dict.each_line do |line|
-        if counter == a
-          word = line.delete("\n")
-          break
-        end
-        counter+=1
-      end
-      if word[0] == letter
-        return word
-      elsif word[0] <= letter
-        higher = true
-      else
-        higher = false
-      end
-    end
+  def adjective(first_letter)
+    list = dictionary('adjectives')[first_letter]
+    list[rand(list.length - 1)]
   end
 end

data/lib/rumm/version.rb

@@ -1,3 +1,3 @@
 module Rumm
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/spec/providers/naming_provider_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+require "naming_provider"
+
+describe "fancy naming" do
+  use_natural_assertions
+  Given(:name) { NamingProvider.new.generate_name *arguments }
+
+  context "with no arguments" do
+    Given(:arguments) { [] }
+    Then { not name.nil? }
+    Then { name.length > 1}
+  end
+  context "with a first letter and last letter" do
+    Given(:parts) { name.split '-' }
+    context "with different letters" do
+      Given(:arguments) { ['f', 'b'] }
+      Then { parts.first[0] == 'f' }
+      Then { parts.last[0] == 'b' }
+    end
+    context "with the same letter" do
+      Given(:arguments) { ['s', 's'] }
+      Then { parts.first[0] == 's'}
+      Then { parts.last[0] == 's' }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require "rumm"
 require "vcr"
 require "aruba/api"
 require "rspec-given"
+$: << File.expand_path("../../app/providers", __FILE__)
 
 module Rumm::SpecHelper
   def will_type(string)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rumm
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Charles Lowell
@@ -29,7 +29,7 @@ cert_chain:
   UgImJlChAzCoDP9zi9tdm6jAr7ttF25R9PPYr11ILb7dYe3qUzlNlM6zJx/nb31b
   IhdyRVup4qLcqYSTPsm6u7VA
   -----END CERTIFICATE-----
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mvcli
@@ -160,6 +160,7 @@ files:
 - app/providers/instances_provider.rb
 - app/providers/loadbalancers_provider.rb
 - app/providers/naming/adj.txt
+- app/providers/naming/dictionary.pstore
 - app/providers/naming/nouns.txt
 - app/providers/naming_provider.rb
 - app/providers/nodes_provider.rb
@@ -223,6 +224,7 @@ files:
 - spec/fixtures/cassettes/show-servers.yml
 - spec/fixtures/cassettes/successful-login.yml
 - spec/fixtures/cassettes/unsuccessful-login.yml
+- spec/providers/naming_provider_spec.rb
 - spec/spec_helper.rb
 - tmp/aruba/.gitkeep
 homepage: https://github.com/rackerlabs/rumm
@@ -259,5 +261,6 @@ test_files:
 - spec/fixtures/cassettes/show-servers.yml
 - spec/fixtures/cassettes/successful-login.yml
 - spec/fixtures/cassettes/unsuccessful-login.yml
+- spec/providers/naming_provider_spec.rb
 - spec/spec_helper.rb
 has_rdoc: