smlspec 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6991ed75c5f26034f05f335944a7ddcd524b9dd
-  data.tar.gz: abceb8d8cce6a840c2d823821d1b57c3e0f43dc5
+  metadata.gz: 39f6feb5a43b36a31bf46b6a5e0be0975d94d9c3
+  data.tar.gz: 0e1517ca695de17afbc6bd5ff39c48e2acedb9de
 SHA512:
-  metadata.gz: e6a28ba4103305899aa80caa3938f584cca26106137f90394956eedd6b554c432914da159fa9b68a10c55b92ed259d99eaf550fff7efd290a80cdfa2d349f2c1
-  data.tar.gz: 1e8870d7795d9c5472d42164d28c69e00dc1e17201e70734c54631e0ba68f6e6d30054af0aea068d493a0d2a06e5bd2ebddf265ff336130e10006b4a55bd3188
+  metadata.gz: eb5387f637557d0020384609d34b0fb228a8c07d01957780c7b36211fcee1c4403048701e943662ddb001358590248b0c85c137da58bd518310e6a361a621b86
+  data.tar.gz: 5e5c2823374179bdaf0e63199e7c8f678d7155cd7b77ef08f9fecfbe75a0747b0f1e4617d304781c5bffa32447bcacf7779d6b8169cb08b1d50b08ab1da8b735

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 0.0.6
+
+- Bug fixes and improvements.
+- Fix crash when runnig command without any arguments.
+
 ## 0.0.5
 - Add colorize gem as runtime dependency.
 - Bug fixes and improvements.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smlspec (0.0.5)
+    smlspec (0.0.6)
       colorize
       thor
 

data/Rakefile

@@ -6,13 +6,46 @@ task default: :spec
 
 desc 'Build gem'
 task :build do
+  guard_against_broken_tests
+
   system "gem build smlspec.gemspec"
   Dir.glob("*.gem") {|f| system "mv #{f} build" }
 end
 
 desc 'Install gem'
 task :install do
+  guard_against_broken_tests
+
   system "gem uninstall smlspec"
   newest_build = Dir.glob("build/*.gem").last
   system "gem install ./#{newest_build}"
 end
+
+desc 'Push to rubygems'
+task :push do
+  guard_against_broken_tests
+
+  newest_build = Dir.glob("build/*.gem").last
+  system "gem push ./#{newest_build}"
+end
+
+desc 'Run all tests and tell if there are failures'
+task :test_all do
+  if tests_passing?
+    puts "OK!"
+  else
+    puts "Errors!"
+  end
+end
+
+def tests_passing?
+  system("rake > /dev/null") && system("cucumber > /dev/null")
+end
+
+def guard_against_broken_tests
+  unless tests_passing?
+    puts "Can't do that with broken tests"
+    exit 1
+  end
+end
+

data/TODO.md

@@ -1,19 +1,19 @@
 # TODOS
 
-## For version 0.0.5
+## For version 0.0.6
 
+- [ ] clean up fixtures folder
+- [ ] refactor binary
+- [ ] show time it took to run tests
 
 ## Others
 
-- [ ] make tests of SmlFile isolated, could be done using dependency injection
 - [ ] allow for other implementations than moscow ml
 - [ ] work with "load" function
-- [ ] show time it took to run tests
-- [ ] refactor binary
-- [ ] clean up fixtures folder
 
 ## Done
 
+- [x] make tests of SmlFile isolated
 - [x] append test function to file
 - [x] write test output parser
 - [x] make change log

data/bin/smlspec

@@ -22,10 +22,10 @@ class Runner
   end
 
   def initialize(input)
-    @input = input || ""
-    check_for_correct_input
+    ensure_correct_input(input)
+    @input = input
 
-    @file = SmlFile.new(@input).prepare_tests
+    @file = SmlFile.new(@input, formatters: [FormatsLines, FormatsTests]).prepare_tests
 
     tmp_file_name = random_name
 
@@ -39,32 +39,34 @@ class Runner
     output = TestOutput.new(e.message.split("\n"))
     puts TestOutputPresenter.parse(output).gsub(tmp_file_name+".sml", @input)
   ensure
-    clean_up!
+    clean_up!(input)
   end
 
   private
 
-  def clean_up!
-    [".uo", ".ui", ".exe"].each do |s|
-      FileUtils.rm_f(File.basename(@file.path, ".*") + s)
-    end
+  def clean_up!(input)
+    if valid_file_input(input)
+      [".uo", ".ui", ".exe"].each do |s|
+        FileUtils.rm_f(File.basename(@file.path, ".*") + s)
+      end
 
-    @file.delete!
+      @file.delete!
+    end
   end
 
   def random_name
     Digest::MD5.hexdigest(Time.now.to_s)
   end
 
-  def check_for_correct_input
-    if !valid_file_input
+  def ensure_correct_input(input)
+    unless valid_file_input(input)
       puts "Gimme an sml file, that exists!"
-      exit 1
+      exit 2
     end
   end
 
-  def valid_file_input
-    @input && File.exists?(@input) && File.extname(@input) == ".sml"
+  def valid_file_input(input)
+    input && !input.empty? && File.exists?(input) && File.extname(input) == ".sml"
   end
 end
 

data/features/running_tests.feature

@@ -12,9 +12,3 @@ Feature: Running SML tests
     Given I have an invalid SML file
     When I run smlspec on the file
     Then I should see a compile error message
-
-  Scenario: Running it without Moscow ML installed
-    Given I have written an SML file with tests
-    And I don't have Moscow ML installed
-    When I run smlspec on the file
-    Then I should see message saying that I don't have Moscow ML installed

data/lib/formats_lines.rb

@@ -14,7 +14,7 @@ class FormatsLines
     @keywords = %w(
       abstype and andalso as case do datatype div
       else end eqtype exception extract fn fun functor
-      handle if in include infix infixr let local mod
+      if in include infix infixr let local mod
       nonfix of op open orelse raise rec sharing sig
       signature struct structure then type val where
       with withtype

data/lib/sml_file.rb

@@ -4,12 +4,18 @@ class SmlFile
   class NotCompiled < Exception; end
   class CannotCompile < Exception; end
   class NotSaved < Exception; end
+  class InvalidFormatterInterface < Exception; end
 
   attr_reader :contents, :path
 
-  def initialize(path, contents=nil)
+  def initialize(path, options={})
     @path = path
-    @contents = contents || File.read(@path)
+    @contents = options[:content] || File.read(@path)
+    @formatters = options[:formatters] || []
+
+    unless @formatters.all? { |f| f.respond_to?(:format) }
+      raise InvalidFormatterInterface
+    end
   end
 
   def save_as!(new_path)
@@ -19,8 +25,11 @@ class SmlFile
   end
 
   def prepare_tests
-    formatted_content = FormatsTests.format(FormatsLines.format(@contents))
-    self.class.new(nil, formatted_content)
+    formatted_content = @formatters.inject(@contents) do |acc, formatter|
+      formatter.format(acc)
+    end
+
+    self.class.new(nil, content: formatted_content, formatters: @formatters)
   end
 
   def compile!(destination)

data/smlspec.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'smlspec'
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.date        = '2012-12-16'
   s.summary     = "Runner for SML tests"
   s.description = "Gem for running tests in SML files"

data/spec/sml_file_spec.rb

@@ -1,13 +1,22 @@
 require 'spec_helper'
-require 'formats_lines'
-require 'formats_tests'
 require 'sml_file'
 
 describe SmlFile do
   before(:each) { clean_tmp }
   after(:each)  { clean_tmp }
 
-  let(:file) { SmlFile.new("spec/fixtures/unformatted_tests.sml") }
+  let(:file) do
+    SmlFile.new("spec/fixtures/unformatted_tests.sml",
+                formatters: [double(format: ""), double(format: "")])
+  end
+
+  it "checks that the formatters have a format method" do
+    expect do
+      SmlFile.new("spec/fixtures/unformatted_tests.sml",
+                  formatters: [Class.new]
+                 )
+    end.to raise_error SmlFile::InvalidFormatterInterface
+  end
 
   describe "#save_as!" do
     before { file.save_as!("tmp/saved_as.sml") }
@@ -23,6 +32,11 @@ describe SmlFile do
 
   describe "#prepare_tests" do
     it "prepares the tests" do
+      formatter = double(format: fixture("formatted_tests.sml"))
+      file = SmlFile.new("spec/fixtures/unformatted_tests.sml",
+                         formatters: [formatter])
+
+      formatter.should_receive(:format)
       file_with_tests_prepared = file.prepare_tests
 
       file_with_tests_prepared.contents.should eq fixture("formatted_tests.sml")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smlspec
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - David Pedersen
@@ -14,70 +14,70 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem for running tests in SML files
@@ -87,8 +87,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -100,6 +100,8 @@ files:
 - build/smlspec-0.0.2.gem
 - build/smlspec-0.0.3.gem
 - build/smlspec-0.0.4.gem
+- build/smlspec-0.0.5.gem
+- build/smlspec-0.0.6.gem
 - features/running_tests.feature
 - features/step_definitions/smlspec_steps.rb
 - features/support/env.rb
@@ -146,17 +148,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Runner for SML tests