Skip to content

Commit

Permalink
upgrading guard and guard-rspec versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakub Těšínský committed Apr 4, 2016
1 parent d244e31 commit 91f1ede
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Guardfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ end

# see http://stackoverflow.com/questions/18501471/guard-how-to-run-specific-tags-from-w-in-guards-console
group :focus do
guard 'rspec', cli: '--tag focus' do watch_all end
guard 'rspec', cmd: '--tag focus' do watch_all end
end

#group :f do
Expand Down
4 changes: 3 additions & 1 deletion lib/rspreadsheet/workbook.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ def initialize(afilename=nil)

# @param [String] Optional new filename
# Saves the worksheet. Optionally you can provide new filename.

def save(new_filename_or_io_object=nil)
if @filename.nil? and new_filename_or_io_object.nil? then raise 'New file should be named on first save.' end

Expand Down Expand Up @@ -115,3 +114,6 @@ def register_worksheet(worksheet)
end
end
end

# bylo firefox.spam -> doposud prazdne tam to chi prenyst
# spam.firefox odsud to chci prenest
6 changes: 3 additions & 3 deletions rspreadsheet.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

# runtime dependencies
spec.add_runtime_dependency 'libxml-ruby', '~>2.7' # parsing XML files
# spec.add_runtime_dependency 'libxml-ruby', '~>2.7' # parsing XML files
spec.add_runtime_dependency 'rubyzip', '~>1.1' # opening zip files
spec.add_runtime_dependency 'andand', '~>1.3'

Expand All @@ -32,8 +32,8 @@ Gem::Specification.new do |spec|

# optional and testing
spec.add_development_dependency "coveralls", '~>0.7'
spec.add_development_dependency "guard", '~>2.6'
spec.add_development_dependency "guard-rspec", '~>2.6'
spec.add_development_dependency "guard", '~>2.13'
spec.add_development_dependency "guard-rspec", '~>4.6'
# spec.add_development_dependency 'equivalent-xml' # implementing xml diff

end
16 changes: 8 additions & 8 deletions spec/io_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
contents_of_files_are_identical($test_filename,tmp_filename)
end

# it 'can open spreadsheet and store it to IO object', :xpending => 'Under development' do
# spreadsheet = Rspreadsheet.new($test_filename) # open a file
#
# stringio = StringIO.new
# spreadsheet.save(stringio)
# raise stringio.read
#
# end
it 'can open spreadsheet and store it to IO object', :xpending => 'Under development' do
spreadsheet = Rspreadsheet.new($test_filename) # open a file

stringio = StringIO.new
spreadsheet.save(stringio)
raise stringio.read

end
end

def contents_of_files_are_identical(filename1,filename2)
Expand Down
6 changes: 5 additions & 1 deletion spec/workbook_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
book.create_worksheet('test')
book.worksheets('test').should eq book.worksheets(1)
book.create_worksheet('another')
book.worksheets('another').should eq book.worksheets(2)
book.worksheets('another').should eq book.worksheets(2)
end
it 'can access sheets with brief syntax' do
book = Rspreadsheet::Workbook.new
Expand All @@ -52,8 +52,12 @@
book.create_worksheet('test')
book.create_worksheet('test2')
sheet = book.worksheets(1)
sheet2 = book.worksheets(1)
book.worksheet(1).should == sheet
book.sheet(1).should == sheet
book.sheets(2).should_not == sheet
book.sheets(-1).should == sheet2
book.sheets(-1).should_not == sheet
book.sheets(-2).should == sheet
end
end

0 comments on commit 91f1ede

Please sign in to comment.