filezor 1.3.5 → 1.3.6

data/Gemfile

@@ -2,8 +2,7 @@ source :rubygems
 
 gem "trollop"
 gem "rake"
-gem "gemcutter"
-gem "jeweler"
+gem "json"
 gem "rack-test"
 gem "rest-client"
 gem "rspec", "<2"

data/Gemfile.lock

@@ -1,13 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    gemcutter (0.6.1)
-    git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
+    json (1.4.6)
     mime-types (1.16)
     rack (1.2.1)
     rack-test (0.5.6)
@@ -16,8 +10,6 @@ GEM
     rest-client (1.6.1)
       mime-types (>= 1.16)
     rspec (1.3.1)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
     sinatra (1.1.0)
       rack (~> 1.1)
       tilt (~> 1.1)
@@ -28,8 +20,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  gemcutter
-  jeweler
+  json
   rack-test
   rake
   rest-client

data/Rakefile

@@ -1,25 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "filezor"
-    gem.summary = %Q{pure ruby file sync}
-    gem.description = %Q{pure ruby file sync}
-    gem.email = "kyle@kylemaxwell.com"
-    gem.homepage = "http://github.com/fizx/filezor"
-    gem.authors = ["Kyle Maxwell"]
-    gem.add_dependency "trollop"
-    gem.add_dependency "rest-client", "~> 1.3"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 def sys(s);puts s; system s; end
 
 require 'spec/rake/spectask'
@@ -34,7 +15,18 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+desc 'Release Sunspot and Sunspot::Rails to Gemcutter'
+task :release do
+  version = File.read("VERSION").strip
+  version_tag = "v#{version}"
+  system "git tag -am 'Release version #{version}' '#{version_tag}'"
+  system "git push origin #{version_tag}:#{version_tag}"
+
+  system "gem build *.gemspec"
+  system "gem push *-#{version}.gem"
+end
+
+task :spec
 
 task :default => :spec
  

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

data/filezor.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{filezor}
-  s.version = "1.3.5"
+  s.version = "1.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
@@ -67,7 +67,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<rspec>, ["< 2"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<trollop>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, ["~> 1.3"])
@@ -79,7 +78,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["< 2"])
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<trollop>, [">= 0"])
       s.add_dependency(%q<rest-client>, ["~> 1.3"])
@@ -92,7 +90,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["< 2"])
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<trollop>, [">= 0"])
     s.add_dependency(%q<rest-client>, ["~> 1.3"])

data/lib/filezor/file.rb

@@ -4,14 +4,15 @@ class Filezor::File
   attr_accessor :tempfile, :md5, :path
   
   module Pathable
-    def path; ""; end
+    attr_accessor :path
   end
   
   def initialize(tempfile, path, hash = nil)
     @tempfile = tempfile
     
     # for ruby 1.9 compat.  Restclient duck-types files on path
-    @tempfile.extend(Pathable) unless @tempfile.respond_to?(:path)
+    @tempfile.extend(Pathable) unless @tempfile.respond_to?(:path) && @tempfile.respond_to?(:path=)
+    @tempfile.path ||= path
     
     @path = path
     @md5 = hash || Filezor::Util::md5(tempfile)

data/spec/filezor/client_spec.rb

@@ -1,13 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-fixtures = File.dirname(__FILE__) + "/../fixtures/."
-@root = File.dirname(__FILE__) + "/../tmp/filezor-test"
-rm_rf @root
-mkdir_p @root
-cp_r fixtures, @root
-
-Filezor::Server.start_embedded!(@root, "hiworld")
-
 describe Filezor::Client do
   
   before do

data/spec/spec_helper.rb

@@ -19,3 +19,12 @@ end
 def upload_fixture_file(name)
   Rack::Test::UploadedFile.new(fixture_file(name).path, "application/binary")
 end
+
+
+fixtures = File.dirname(__FILE__) + "/fixtures/."
+@root = File.dirname(__FILE__) + "/tmp/filezor-test"
+rm_rf @root
+mkdir_p @root
+cp_r fixtures, @root
+
+Filezor::Server.start_embedded!(@root, "hiworld")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: filezor
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -19,6 +19,8 @@ date: 2010-12-05 00:00:00 -08:00
 default_executable: filezor
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,10 +31,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: trollop
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,10 +45,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: rake
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: gemcutter
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,10 +59,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: gemcutter
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -71,10 +73,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: jeweler
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -85,10 +87,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: rack-test
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,25 +101,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: rest-client
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  type: :runtime
-  name: rspec
+  name: sinatra
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,11 +115,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: sinatra
-  prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: trollop
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -141,11 +129,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  name: trollop
-  prerelease: false
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: rest-client
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -156,11 +144,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :runtime
-  name: rest-client
-  prerelease: false
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -172,9 +160,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  name: rspec
-  prerelease: false
-  version_requirements: *id011
+  version_requirements: *id010
 description: pure ruby file sync
 email: kyle@kylemaxwell.com
 executables: 
@@ -240,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: pure ruby file sync