primetable 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f529942f1f2d716e11f9609269616f35df535a74
-  data.tar.gz: 7edabbe0d6900024c84ea305916e1f0febab1631
+  metadata.gz: ae2aa3d6779044cdd1d19943acdd0a3e6e01ff9a
+  data.tar.gz: 182c03f1034484cb7e763f72a9f42ec674544847
 SHA512:
-  metadata.gz: 00104a159da8a03925648e49f8ef36ab92d00e1eb76cded4d178c1b2847f26bc00ae00e2650a5c6aa1b8050c229213f6953268a6521ecbef23c558e96588093a
-  data.tar.gz: bb899a0aa5e6d5d646e23604b07b8dae355f2f440e385041caf602ba859175546349a64ecc4c4e337b339e25f0c65abf9fc95028599349d11b54601ede89355f
+  metadata.gz: a9223cd8283e1595f9f7ee75ccaeb0dcad8908879cb083df062667898793634bee90ec736ea48d3bd6f34b73f5f418922ce8f6579441ccf3febafe9afd839632
+  data.tar.gz: e9f6e1c7575be3ad6d7e0515d2b2cb687337cb892c5e80a2da49485cbbeeee903b0145d8964b7ce1965b8be71987faad56aeb9b8d0a39e00ba1681e0ec4e8a01

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    primetable (1.0.0)
+    primetable (1.1.0)
       formatador (~> 0.2, >= 0.2.5)
       therubyracer (~> 0.12, >= 0.12.2)
 
@@ -43,7 +43,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.6)
   primetable!
-  pry
+  pry (~> 0.10, >= 0.10.2)
   rake (~> 10.4, >= 10.4.2)
   rspec (~> 3.4, >= 3.4.0)
 

data/README.md

@@ -1,4 +1,4 @@
-# PrimeTable
+# PrimeTable v1.1.0
 
   **Prints a multiplication table of N primes to STDOUT**
 
@@ -15,13 +15,15 @@
     Specific options:
         -f F                             First prime (default is 2, limit is 2000003 w/ -m load|fast, 9007199254740727 w/ -m calc)
         -n N                             Number of primes for which you wish to generate a table
-        -m, --method METHOD              Select method of generating primes (fast|load|calc) (default is 'calc')
+        -m, --method METHOD              Select method of generating primes (fast|load|calc)** (default is 'calc')
         -t, --time                       Display run time
     
     Common options:
         -h, --help                       Show this message
         -v, --version                    Show version
 
+    ** NOTE: The (so-called) 'fast' and 'load' prime methods are DEPRECATED. Use the default or -m 'calc'.
+
 ## Status
 
 [![Build Status](https://travis-ci.org/day/primetable.svg?branch=master)](https://travis-ci.org/day/primetable)

data/bin/primetable

@@ -4,7 +4,6 @@ require 'primetable'
 require 'timer'
 require 'optparse'
 require 'ostruct'
-require 'pry'
 
 class OptParse
 
@@ -160,6 +159,11 @@ if options.flags.version
   messages.push("PrimeTable v#{PrimeTable::VERSION}")
 end
 
+# Deprecating the 'fast' and 'load' prime_methods
+if options.flags.prime_method != :calc
+  messages.push("Warning! The (so-called) 'fast' and 'load' prime_methods are DEPRECATED. Use the default or -m 'calc'.")
+end
+
 # TODO: DRY this up! I'm repeating myself a lot right here.
 if ARGS != ["-h"]
   if options.flags.time

data/lib/primetable.rb

@@ -1,9 +1,9 @@
-# Require modules from the lib/primetable directory...right now it's just our VERSION constant
-Dir["#{File.dirname(__FILE__)}/primetable/**/*.rb"].each { |f| require(f) }
+# Require modules from the lib/primetable directory...a PRIMES constant, and a VERSION constant
+ROOT_DIR = "#{File.dirname(File.expand_path('..', __FILE__))}"
+Dir["#{ROOT_DIR}/lib/primetable/**/*.rb"].each { |f| require(f) }
 
 # This is needed for load_primes method, which loads data from a file.
 require "yaml"
-require "pry"
 
 # This is used in the display_table method to...um, display the table ;-)
 require "formatador"
@@ -114,7 +114,7 @@ class PrimeTable
 
     grep_result = []
     while grep_result == []
-      grep_result = `grep -n -e "#{wb_before}#{first}#{wb_after}" data/prime.dat`.split(":")
+      grep_result = `grep -n -e "#{wb_before}#{first}#{wb_after}" #{ROOT_DIR}/data/prime.dat`.split(":")
       if grep_result == []
         first = first + 1
       end
@@ -153,7 +153,7 @@ class PrimeTable
     # some astronomical prime, we won't seize up the CPU forever. 7000ms is arbitrary.
     calc_primes_js = V8::Context.new timeout: 7000
     File.open("js/prime.js") do |file|
-      calc_primes_js.eval(file, "js/prime.js")
+      calc_primes_js.eval(file, "#{ROOT_DIR}/js/prime.js")
     end
     primes_js = calc_primes_js.eval("generatePrimes(#{first},#{count})")
     YAML::load("[#{primes_js}]")

data/lib/primetable/version.rb

@@ -1,3 +1,3 @@
 class PrimeTable
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/primetable_spec.rb

@@ -73,6 +73,10 @@ Common options:
 
   end
 
+  it 'knows where it is (has a root dir)' do
+    expect(ROOT_DIR.split("/")[-1]).to eq "primetable"
+  end
+
   it 'has a version number' do
     expect(PrimeTable::VERSION).not_to be nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: primetable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Day Davis Waterbury