synt 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d8eb90258e1d9b95e1f14d9d93a0f742426c98
-  data.tar.gz: 48febfb847f4d9031c8b0335c8ffe408728bf8ca
+  metadata.gz: 656ca89214a981b499724da4bfeaf43c2de085d4
+  data.tar.gz: 59fcdcb6c52321be7441cc3ddcc69dfb1c282dfd
 SHA512:
-  metadata.gz: d46ef30ae4c429863047b957d1eea15ff1e4c19cde044b93ad785a85d3818904d5df97531c48ac0e56675784fb98237d22a9db9c03c38fbe77badcd6c1714050
-  data.tar.gz: 3f1e5c9381a6d790d6f9da8f52929a1160a77f29f931e348a987cf8614dd27c4f3b12e29bb803466624e4a010b7a47dbf568bfdc500110f9d28584b321595ca4
+  metadata.gz: bb0b5d506e958cd1801a98d853228b0975fcf6adf38fa6f11506285759b4763a7ecc1d74c2f9a5e76c547c2be10721946fdc8404070c663459e7377035d83a7e
+  data.tar.gz: 30477ea25ef2156e7bf43e5ec000a8ea7ac39758d97254900811c575926e22117d028c45dd70e79aa8b2b61c6ba00549a45e954667043cd5737b85780453e8bb

data/.ruby-version

@@ -0,0 +1 @@
+2.1.5

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'slop', '3.6.0'
 gem 'manowar', '0.0.1'
-gem 'rspec', '3.0.0', require: false, group: :development
-gem 'rubocop', '0.25.0', require: false, group: :development
-gem 'simplecov', '0.9.0', require: false, group: :development
-gem 'simplecov-lcov', require: false, group: :development
+gem 'rspec', '3.1.0', require: false, group: :development
+gem 'rubocop', '0.28.0', require: false, group: :development
+gem 'simplecov', '0.9.1', require: false, group: :development
+gem 'simplecov-lcov', '0.4.0', require: false, group: :development

data/Gemfile.lock

@@ -2,39 +2,42 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
     manowar (0.0.1)
     multi_json (1.10.1)
-    parser (2.2.0.pre.4)
+    parser (2.2.0.1)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
     rainbow (2.0.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
-    rubocop (0.25.0)
-      parser (>= 2.2.0.pre.4, < 3.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rubocop (0.28.0)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.6.0)
-    simplecov (0.9.0)
+    ruby-progressbar (1.7.1)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    simplecov-lcov (0.3.0)
+    simplecov-lcov (0.4.0)
     slop (3.6.0)
 
 PLATFORMS
@@ -42,8 +45,8 @@ PLATFORMS
 
 DEPENDENCIES
   manowar (= 0.0.1)
-  rspec (= 3.0.0)
-  rubocop (= 0.25.0)
-  simplecov (= 0.9.0)
-  simplecov-lcov
+  rspec (= 3.1.0)
+  rubocop (= 0.28.0)
+  simplecov (= 0.9.1)
+  simplecov-lcov (= 0.4.0)
   slop (= 3.6.0)

data/lib/synt.rb

@@ -9,10 +9,10 @@ module Synt
     opts = CLI.parse
     diff = Similar.compare opts
 
-    puts "Inputs are %#{diff} similar."
+    puts "Inputs are #{diff}% similar."
 
-    if opts.threshold? && diff < opts[:threshold].to_f
-      puts "Similarity threshold of #{opts[:threshold]} hit."
+    if opts.threshold? && diff < opts["min-threshold"].to_f
+      puts "Similarity threshold of #{opts["min-threshold"]}% hit."
       exit 1
     end
   end

data/lib/synt/cli.rb

@@ -16,15 +16,18 @@ module Synt::CLI
   API = proc {
     banner 'Usage: synt.rb [options]'
 
-    on 'c=', 'compare=', 'File or String to compare to something.'
-    on 't=', 'to=', 'File or String to compare against.'
-    on 'a=', 'algorithm=', 'Similarity algorithm [default=jaccard,tanimoto].'
-    on 'n=', 'ngram=', 'Specify what ngrams are generated and used for
-                       comparing token sequences.
-                       [default=1,2,4..5,10,...,all]'
-    on 'd=', 'threshold=', 'Similarity threshold and exit with error.'
+    on 'c=', 'compare=',        'File to compare to something.'
+    on 't=', 'to=',             'File to compare against.'
+    on 's',  'string-compare',  'Compare strings instead of files.'
+    on 'a=', 'algorithm=',      'Similarity algorithm
+                                 [default=jaccard,tanimoto].'
+    on 'n=', 'ngram=',          'Specify what ngrams are generated and used for
+                                 comparing token sequences.
+                                 [default=1,2,4..5,10,...,all]'
+    on 'm=', 'min-threshold=',  'Similarity threshold % (ex: -m 70)
+                                 to exit with error.'
 
-    on '-v', 'version', 'Print the version.' do
+    on '-v', 'version',         'Print the version.' do
       puts Synt::VERSION
       exit 0
     end

data/lib/synt/similar.rb

@@ -8,20 +8,13 @@ define 'Synt'
 module Synt::Similar
   extend self
 
-  def determine string_or_file
-    if File.exists? string_or_file
-      IO.read string_or_file
-    else
-      string_or_file || ''
-    end
-  end
-
   def compare opts
     error 'no compare propery provided' unless opts[:compare]
     error 'no to propery provided' unless opts[:to]
 
-    src = determine opts[:compare]
-    cmp = determine opts[:to]
+    # TODO: string-compare sucks to reference..
+    src = parse_data opts["string-compare"], opts[:compare]
+    cmp = parse_data opts["string-compare"], opts[:to]
     algorithm = algorithms[(opts[:algorithm] || 'jaccard').to_sym]
     n_start, n_end = ngram_range opts[:ngram]
     src_t = normalize_ripper_tokens Synt::Parser.parse(src)
@@ -41,6 +34,14 @@ module Synt::Similar
     { jaccard: Jaccard, tanimoto: Tanimoto }
   end
 
+  def parse_data is_string, value
+    if is_string
+      value
+    else
+      IO.read value
+    end
+  end
+
   def generate_ngrams arr, start, nend
     nend = arr.length unless nend
     start = 1 unless start

data/lib/synt/version.rb

@@ -1,3 +1,3 @@
 module Synt
-  VERSION = "0.1.3"
+  VERSION = "0.3.0"
 end

data/spec/synt_spec.rb

@@ -13,11 +13,12 @@ describe Synt::Similar do
   let(:dissimilar_a_path) { 'spec/fixtures/compare-rb-dissimilar-a.rb' }
   let(:dissimilar_b_path) { 'spec/fixtures/compare-rb-dissimilar-b.rb' }
 
+  # TODO: implement min-threshold behaviour
+
   context 'cli' do
     context 'comparing things' do
       context 'that are Files' do
         before do
-          allow(File).to receive(:exists?).and_return(true)
           expect(IO).to receive(:read).and_return("42").twice
         end
 
@@ -28,27 +29,29 @@ describe Synt::Similar do
 
       context 'that are Strings' do
         before do
-          allow(File).to receive(:exists?).and_return(false)
           expect(IO).to_not receive(:read)
         end
 
         it 'should not read any files' do
-          subject.compare compare: "file/path.rb", to: "file/path2"
+          subject.compare compare: "file/path.rb",
+                          to: "file/path2",
+                          "string-compare" => true
         end
       end
     end
   end
 
   context 'duplicate code comparison' do
-    let(:dupe) { file_to_s duplicate_path }
-
     algorithms.each do |algorithm|
       context "using the #{algorithm} algorithm" do
         ngram_types.each do |ngram|
           context "with an ngram of #{ngram}" do
             it 'is 100%' do
-              sim = subject.compare compare: dupe, to: dupe,
-                                    ngram: ngram, algorithm: algorithm
+              sim = subject.compare compare: duplicate_path,
+                                    to: duplicate_path,
+                                    ngram: ngram,
+                                    algorithm: algorithm
+
               expect(sim).to eq 100
             end
           end
@@ -58,13 +61,11 @@ describe Synt::Similar do
   end
 
   context 'similar code comparison' do
-    let(:sim_a) { file_to_s similar_a_path }
-    let(:sim_b) { file_to_s similar_b_path }
-
     algorithms.each do |algorithm|
       context "using the #{algorithm} algorithm" do
         it 'is ~81%' do
-          sim = subject.compare compare: sim_a, to: sim_b,
+          sim = subject.compare compare: similar_a_path,
+                                to: similar_b_path,
                                 algorithm: algorithm
           expect(80..82).to cover(sim)
         end
@@ -73,13 +74,11 @@ describe Synt::Similar do
   end
 
   context 'dissimilar code comparison' do
-    let(:dissim_a) { file_to_s dissimilar_a_path }
-    let(:dissim_b) { file_to_s dissimilar_b_path }
-
     algorithms.each do |algorithm|
       context "using the #{algorithm} algorithm" do
         it 'is ~22%' do
-          sim = subject.compare compare: dissim_a, to: dissim_b,
+          sim = subject.compare compare: dissimilar_a_path,
+                                to: dissimilar_b_path,
                                 algorithm: algorithm
           expect(21..23).to cover(sim)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Brent Lintner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: manowar
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - bin/lint
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Similar code analysis.