git_wrapper 1.0.2 → 1.0.3

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
-require 'git_wrapper'
-
-include GitWrapper
-include GitWrapper::Results
-
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-
+require 'git_wrapper'
+
+include GitWrapper
+include GitWrapper::Results
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+
 end

data/spec/status_porcelain_parser_spec.rb

@@ -1,87 +1,87 @@
-require 'spec_helper'
-
-describe GitWrapper, '-> Status porcelain parser' do
-
-  it 'Untracked file' do
-    text = '?? file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('file.txt')
-    file_status.status.should be(:untracked)
-    file_status.staged_for_commit.should be_false
-  end
-
-  it 'New file' do
-    text = 'A  file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('file.txt')
-    file_status.status.should be(:new_file)
-    file_status.staged_for_commit.should be_true
-  end
-
-  it 'Modified' do
-    text = ' M file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('file.txt')
-    file_status.status.should be(:modified)
-    file_status.staged_for_commit.should be_false
-  end
-
-  it 'Modified and staged for commit' do
-    text = 'M  file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('file.txt')
-    file_status.status.should be(:modified)
-    file_status.staged_for_commit.should be_true
-  end
-
-  it 'Deleted' do
-    text = ' D file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('file.txt')
-    file_status.status.should be(:deleted)
-    file_status.staged_for_commit.should be_false
-  end
-
-  it 'Deleted and staged for commit' do
-    text = 'D  file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('file.txt')
-    file_status.status.should be(:deleted)
-    file_status.staged_for_commit.should be_true
-  end
-
-  it 'Merge conflict (UU)' do
-    text = 'UU file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('file.txt')
-    file_status.status.should be(:merge_conflict)
-    file_status.staged_for_commit.should be_false
-  end
-
-  it 'Merge conflict (AA)' do
-    text = 'AA file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('file.txt')
-    file_status.status.should be(:merge_conflict)
-    file_status.staged_for_commit.should be_false
-  end
-
-  it 'Renamed' do
-    text = 'R  file.txt -> new_file.txt'
-    file_status = StatusPorcelain.parse(text)
-
-    file_status.file_name.should eq('new_file.txt')
-    file_status.original_file_name.should eq('file.txt')
-    file_status.status.should be(:renamed)
-    file_status.staged_for_commit.should be_true
-  end
-
+require 'spec_helper'
+
+describe GitWrapper, '-> Status porcelain parser' do
+
+  it 'Untracked file' do
+    text = '?? file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:untracked)
+    file_status.staged_for_commit.should be_false
+  end
+
+  it 'New file' do
+    text = 'A  file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:new_file)
+    file_status.staged_for_commit.should be_true
+  end
+
+  it 'Modified' do
+    text = ' M file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:modified)
+    file_status.staged_for_commit.should be_false
+  end
+
+  it 'Modified and staged for commit' do
+    text = 'M  file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:modified)
+    file_status.staged_for_commit.should be_true
+  end
+
+  it 'Deleted' do
+    text = ' D file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:deleted)
+    file_status.staged_for_commit.should be_false
+  end
+
+  it 'Deleted and staged for commit' do
+    text = 'D  file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:deleted)
+    file_status.staged_for_commit.should be_true
+  end
+
+  it 'Merge conflict (UU)' do
+    text = 'UU file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:merge_conflict)
+    file_status.staged_for_commit.should be_false
+  end
+
+  it 'Merge conflict (AA)' do
+    text = 'AA file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:merge_conflict)
+    file_status.staged_for_commit.should be_false
+  end
+
+  it 'Renamed' do
+    text = 'R  file.txt -> new_file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('new_file.txt')
+    file_status.original_file_name.should eq('file.txt')
+    file_status.status.should be(:renamed)
+    file_status.staged_for_commit.should be_true
+  end
+
 end

data/spec/support/helpers/file_helper.rb

@@ -1,37 +1,41 @@
-require 'fileutils'
-
-class FileHelper
-
-  def initialize
-    @temp_folders = []
-  end
-
-  def create_temp_folder
-    folder_name = "#{ENV['TMP'].gsub('\\', '/')}/#{timestamp}"
-    @temp_folders << folder_name
-    Dir.mkdir folder_name
-    folder_name
-  end
-
-  def remove_temp_folders
-    @temp_folders.each do |folder_name|
-      FileUtils.rm_rf folder_name
-    end
-  end
-
-  def create_temp_file(folder, content)
-    file_name = "#{folder}/file #{timestamp}.txt"
-    sleep(0.01)
-    File.open(file_name, 'w') do |file|
-      file.puts content
-    end
-    file_name
-  end
-
-  private
-
-  def timestamp
-    (Time.now.to_f * 1000).to_i
-  end
-
+require 'fileutils'
+
+class FileHelper
+
+  def initialize
+    @temp_folders = []
+  end
+
+  def create_temp_folder
+    folder_name = "#{temp_path}/#{timestamp}"
+    @temp_folders << folder_name
+    FileUtils.mkpath folder_name
+    folder_name
+  end
+
+  def remove_temp_folders
+    @temp_folders.each do |folder_name|
+      FileUtils.rm_rf folder_name
+    end
+  end
+
+  def create_temp_file(folder, content)
+    file_name = "#{folder}/file #{timestamp}.txt"
+    sleep(0.01)
+    File.open(file_name, 'w') do |file|
+      file.puts content
+    end
+    file_name
+  end
+
+  private
+
+  def temp_path
+    Pathname.new("#{File.dirname(__FILE__)}/../../tmp").expand_path.to_s
+  end
+
+  def timestamp
+    (Time.now.to_f * 1000).to_i
+  end
+
 end

data/spec/support/matchers/git_status_matchers.rb

@@ -1,40 +1,40 @@
-RSpec::Matchers.define :eq_git_status do |expected|
-  match do |actual|
-    (expected[:file_name].nil? || actual.file_name == expected[:file_name]) &&
-      (expected[:original_file_name].nil? || actual.original_file_name == expected[:original_file_name]) &&
-      (expected[:status].nil? || actual.status == expected[:status]) &&
-      (expected[:staged_for_commit].nil? || actual.staged_for_commit == expected[:staged_for_commit])
-  end
-end
-
-RSpec::Matchers.define :be_git_untracked do |expected_file_name|
-  match do |actual|
-    actual.file_name == expected_file_name &&
-      actual.status == :untracked &&
-      !actual.staged_for_commit
-  end
-end
-
-RSpec::Matchers.define :be_git_new_file do |expected_file_name|
-  match do |actual|
-    actual.file_name == expected_file_name &&
-      actual.status == :new_file &&
-      actual.staged_for_commit
-  end
-end
-
-RSpec::Matchers.define :be_git_deleted do |expected_file_name|
-  match do |actual|
-    actual.file_name == expected_file_name &&
-      actual.status == :deleted &&
-      actual.staged_for_commit
-  end
-end
-
-RSpec::Matchers.define :be_git_merge_conflict do |expected_file_name|
-  match do |actual|
-    actual.file_name == expected_file_name &&
-      actual.status == :merge_conflict &&
-      !actual.staged_for_commit
-  end
+RSpec::Matchers.define :eq_git_status do |expected|
+  match do |actual|
+    (expected[:file_name].nil? || actual.file_name == expected[:file_name]) &&
+      (expected[:original_file_name].nil? || actual.original_file_name == expected[:original_file_name]) &&
+      (expected[:status].nil? || actual.status == expected[:status]) &&
+      (expected[:staged_for_commit].nil? || actual.staged_for_commit == expected[:staged_for_commit])
+  end
+end
+
+RSpec::Matchers.define :be_git_untracked do |expected_file_name|
+  match do |actual|
+    actual.file_name == expected_file_name &&
+      actual.status == :untracked &&
+      !actual.staged_for_commit
+  end
+end
+
+RSpec::Matchers.define :be_git_new_file do |expected_file_name|
+  match do |actual|
+    actual.file_name == expected_file_name &&
+      actual.status == :new_file &&
+      actual.staged_for_commit
+  end
+end
+
+RSpec::Matchers.define :be_git_deleted do |expected_file_name|
+  match do |actual|
+    actual.file_name == expected_file_name &&
+      actual.status == :deleted &&
+      actual.staged_for_commit
+  end
+end
+
+RSpec::Matchers.define :be_git_merge_conflict do |expected_file_name|
+  match do |actual|
+    actual.file_name == expected_file_name &&
+      actual.status == :merge_conflict &&
+      !actual.staged_for_commit
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &28348860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28348860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28348608 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28348608
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OO git command line wrapper
 email:
 - gabynaiman@gmail.com
@@ -98,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OO git command line wrapper