primetable 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2aa3d6779044cdd1d19943acdd0a3e6e01ff9a
-  data.tar.gz: 182c03f1034484cb7e763f72a9f42ec674544847
+  metadata.gz: 566ac4a8fea09057f10c6a0de3a8fe8e3e777f4d
+  data.tar.gz: 51efa22f323ae8bd1adf0c1c050e2f3533a241e0
 SHA512:
-  metadata.gz: a9223cd8283e1595f9f7ee75ccaeb0dcad8908879cb083df062667898793634bee90ec736ea48d3bd6f34b73f5f418922ce8f6579441ccf3febafe9afd839632
-  data.tar.gz: e9f6e1c7575be3ad6d7e0515d2b2cb687337cb892c5e80a2da49485cbbeeee903b0145d8964b7ce1965b8be71987faad56aeb9b8d0a39e00ba1681e0ec4e8a01
+  metadata.gz: 8699d55cc6edf5fc7f62a84ac132ca57c79d1f08bdb0d7726a2bcd3af4ff41d068a2ff8089be24541814feaa930b84434d8eed618bc08497a3146b998a1da4a0
+  data.tar.gz: 6df357240c68bbbbdc1214e328b7dd75c5c99855c1ee54c2a2ca1bcef90fa988863b35e3e813736dac32cb88b2d0c6b3ef4659e80cb9038a43a6ed6bbf3bab69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    primetable (1.1.0)
+    primetable (1.1.2)
       formatador (~> 0.2, >= 0.2.5)
       therubyracer (~> 0.12, >= 0.12.2)
 

data/js/prime.js

@@ -1,3 +1,8 @@
+// LIBPRIME
+// Script: prime.js
+// Author: Day Davis Waterbury
+// License: MIT (../LICENSE.txt)
+
 var factors = [];
 var primes = [];
 
@@ -20,7 +25,7 @@ function libPrime(method, n, count) {
     }
     return primes;
   }
-  // console.log("* n:"+n);
+
   // We don't care about divisibility by 1, so we begin at 2
   var divisor = 2;
 
@@ -77,10 +82,3 @@ function primeFactors(n) {
 function generatePrimes(n,count) {
   return libPrime("generatePrimes",n, count);
 }
-// Try it out
-// // console.log(isPrime(1));
-// console.log(generatePrimes(1999867));
-// Try it out
-// for (var i = 1; i < 1002; i++) {
-//   // console.log(i + " is " + (isPrime(i) ? "PRIME" : "COMPOSITE") + (!(isPrime(i)) ? (": " + primeFactors(i)) : ""));
-// }

data/lib/primetable.rb

@@ -131,7 +131,7 @@ class PrimeTable
     # Here we read in the file one line at a time. Yes I looked for a faster way. Try :fast (-f).
     #  1) We don't want to slurp the whole file...what if the file was even larger? Not cool.
     #  2) IO.readlines gets the file one line at a time, so we need a line number, not an index.
-    IO.readlines("data/prime.dat").each_with_index{|line,ln|
+    IO.readlines("#{ROOT_DIR}/data/prime.dat").each_with_index{|line,ln|
       
       # When we find the lines we want, we concatenate them into a single array. We get extra.
       if (ln >= first_line and ln <= last_line)
@@ -152,8 +152,8 @@ class PrimeTable
     # One nice thing about this is that I can easily set a timeout, so if someone asks us to run
     # 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, "#{ROOT_DIR}/js/prime.js")
+    File.open("#{ROOT_DIR}/js/prime.js") do |file|
+      calc_primes_js.eval(file)
     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.1"
+  VERSION = "1.1.2"
 end

data/spec/primetable_spec.rb

@@ -81,9 +81,18 @@ Common options:
     expect(PrimeTable::VERSION).not_to be nil
   end
 
+  it "can access the JS script for generating primes" do
+    expect(`head -n 1 #{ROOT_DIR}/js/prime.js`).to eq "// LIBPRIME\n"
+  end
+
+  it "can access the data file for pre-calculated primes" do
+    expect(`head -n 1 #{ROOT_DIR}/data/prime.dat`).to eq "[2,3,5,7,11,13,17,19,23,29]\n"
+  end
+
   it 'executes when called on the command line' do
     expect(`primetable`).to include("PrimeTable is running...\n")
   end
+
   it 'executes *and* prints out a run time when passed -t or --time' do
     execution_output = `primetable -t`
     expect(execution_output).to include(@expected_execution_output)
@@ -91,22 +100,36 @@ Common options:
     execution_output = `primetable --time`
     expect(execution_output).to include(@expected_execution_output)
     expect(execution_output).to include(@expected_time_output)
-  end  
+  end
+
   it 'prints out the version number when passed -v or --version' do
-    expect(`primetable -v`).to include(@expected_version_output)
+    execution_output = `primetable -v`
+    expect(execution_output).to include(@expected_version_output)
+    execution_output = `primetable --version`
+    expect(execution_output).to include(@expected_version_output)
+  end
+
+  it 'it does *not* generate a table when called with *only* -v or --version' do
+    execution_output = `primetable -v`
+    expect(execution_output).not_to include(@expected_table_display_first_ten)
+    execution_output = `primetable --version`
+    expect(execution_output).not_to include(@expected_table_display_first_ten)
   end
+
   it 'executes *and* prints out a run time *and* prints out the version number when passed both -t and -v arguments' do
     execution_output = `primetable -tv`
     expect(execution_output).to include(@expected_execution_output)
     expect(execution_output).to include(@expected_time_output)
     expect(execution_output).to include(@expected_version_output)
   end
+
   it 'executes *and* prints out a run time *and* prints out the version number when passed both --time and --version arguments' do
     execution_output = `primetable --time --version`
     expect(execution_output).to include(@expected_execution_output)
     expect(execution_output).to include(@expected_time_output)
     expect(execution_output).to include(@expected_version_output)
   end
+
   it 'prints out usage details when passed -h or --help' do
     execution_output = `primetable -h`
     expect(execution_output).to include(@expected_help_output)
@@ -114,16 +137,25 @@ Common options:
     expect(execution_output).to include(@expected_help_output)
   end
 
+  it 'it does *not* generate a table when called with *only* -h or --help' do
+    execution_output = `primetable -h`
+    expect(execution_output).not_to include(@expected_table_display_first_ten)
+    execution_output = `primetable --help`
+    expect(execution_output).not_to include(@expected_table_display_first_ten)
+  end
+
   it "has the right data when we run it with :load" do
     test_instance = PrimeTable.new(2,10,:load,true)
     expect(test_instance.primes).to eq(@expected_first_ten_primes)
     expect(test_instance.table).to eq(@expected_table_with_first_ten_primes)
   end
+
   it "has the right data when we run it with :fast" do
     test_instance = PrimeTable.new(2,10,:fast,true)
     expect(test_instance.primes).to eq(@expected_first_ten_primes)
     expect(test_instance.table).to eq(@expected_table_with_first_ten_primes)
   end
+
   it "has the right data when we run it with :calc" do
     test_instance = PrimeTable.new(2,10,:calc,true)
     expect(test_instance.primes).to eq(@expected_first_ten_primes)

metadata

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