rhosync 2.0.0.beta7 → 2.0.0.beta8

data/examples/simple/application.rb

@@ -4,9 +4,23 @@ class Application < Rhosync::Base
       true # do some interesting authentication here...
     end
     
+    # Add hooks for application startup here
+    # Don't forget to call super at the end!
     def initializer(path)
       super
     end
+    
+    # Calling super here returns rack tempfile path:
+    # i.e. /var/folders/J4/J4wGJ-r6H7S313GEZ-Xx5E+++TI
+    # Note: This tempfile is removed when server stops or crashes...
+    # See http://rack.rubyforge.org/doc/Multipart.html for more info
+    # 
+    # Override this by creating a copy of the file somewhere
+    # and returning the path to that file (then don't call super!):
+    # i.e. /mnt/myimages/soccer.png
+    def store_blob(blob)
+      super #=> returns blob[:tempfile]
+    end
   end
 end
 

data/lib/rhosync/app.rb

@@ -31,19 +31,6 @@ module Rhosync
       end
     end
     
-    # TODO: Do we need this anymore?
-    # def delete
-    #   sources.members.each do |source_name|
-    #     Source.load(source_name,{:app_id => self.name,
-    #       :user_id => '*'}).delete
-    #   end
-    #   users.members.each do |user_name|
-    #     User.load(user_name).delete
-    #   end
-    #   ReadState.delete(self.name)
-    #   super
-    # end
-    
     def delegate
       @delegate.nil? ? Object.const_get(camelize(self.name)) : @delegate
     end

data/lib/rhosync/console/rhosync_api.rb

@@ -2,10 +2,11 @@ require 'rest_client'
 
 module RhosyncApi
   class << self
-    
+
     def get_token(server,login,password)
-      res = RestClient.post("#{server}/login", 
+      res = RestClient.post("#{server}/login",
           {:login => login, :password => password}.to_json, :content_type => :json)
+      res.cookies['rhosync_session'] = CGI.escape(res.cookies['rhosync_session'])
       RestClient.post("#{server}/api/get_api_token",'',{:cookies => res.cookies})
     end
     

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.0.0.beta7'
+  VERSION = '2.0.0.beta8'
 end

data/tasks/redis.rake

@@ -58,7 +58,7 @@ class RedisRunner
   end
 
   def self.stop
-    sh 'echo "SHUTDOWN" | nc localhost 6379'
+    Redis.new.shutdown
   end
 
 end
@@ -159,24 +159,25 @@ namespace :dtach do
 
   desc 'Install dtach 0.8 from source'
   task :install => [:about] do
+    unless windows?
+      Dir.chdir('/tmp/')
+      unless File.exists?('/tmp/dtach-0.8.tar.gz')
+        require 'net/http'
 
-    Dir.chdir('/tmp/')
-    unless File.exists?('/tmp/dtach-0.8.tar.gz')
-      require 'net/http'
+        url = 'http://downloads.sourceforge.net/project/dtach/dtach/0.8/dtach-0.8.tar.gz'
+        open('/tmp/dtach-0.8.tar.gz', 'wb') do |file| file.write(open(url).read) end
+      end
 
-      url = 'http://downloads.sourceforge.net/project/dtach/dtach/0.8/dtach-0.8.tar.gz'
-      open('/tmp/dtach-0.8.tar.gz', 'wb') do |file| file.write(open(url).read) end
-    end
-
-    unless File.directory?('/tmp/dtach-0.8')
-      system('tar xzf dtach-0.8.tar.gz')
-    end
+      unless File.directory?('/tmp/dtach-0.8')
+        system('tar xzf dtach-0.8.tar.gz')
+      end
 
-    ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
-    Dir.chdir('/tmp/dtach-0.8/')
-    sh 'cd /tmp/dtach-0.8/ && ./configure && make'
-    sh "cp /tmp/dtach-0.8/dtach #{bin_dir}"
+      ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
+      Dir.chdir('/tmp/dtach-0.8/')
+      sh 'cd /tmp/dtach-0.8/ && ./configure && make'
+      sh "cp /tmp/dtach-0.8/dtach #{bin_dir}"
 
-    puts "Dtach successfully installed to #{bin_dir}"
+      puts "Dtach successfully installed to #{bin_dir}"
+    end
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
+  hash: -1848230044
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta7
-  version: 2.0.0.beta7
+  - beta8
+  version: 2.0.0.beta8
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -07:00
+date: 2010-05-26 00:00:00 -07:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -36,9 +39,11 @@ dependencies:
   name: log4r
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 1
@@ -50,9 +55,11 @@ dependencies:
   name: sqlite3-ruby
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 2
@@ -64,9 +71,11 @@ dependencies:
   name: rubyzip
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 9
@@ -78,9 +87,11 @@ dependencies:
   name: uuidtools
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 1
@@ -92,9 +103,11 @@ dependencies:
   name: redis
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -106,9 +119,11 @@ dependencies:
   name: resque
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 1
         - 8
@@ -120,9 +135,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -134,9 +151,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -147,9 +166,11 @@ dependencies:
   name: templater
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -161,9 +182,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
@@ -175,9 +198,11 @@ dependencies:
   name: jeweler
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -189,9 +214,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -203,9 +230,11 @@ dependencies:
   name: rcov
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -217,9 +246,11 @@ dependencies:
   name: faker
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 3
@@ -231,9 +262,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
@@ -241,7 +274,23 @@ dependencies:
         version: 0.5.3
   type: :development
   version_requirements: *id016
-description: Rhosync library and related command-line utilities for using Rhosync
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 13
+        - 6
+        version: 0.13.6
+  type: :development
+  version_requirements: *id017
+description: RhoSync Synchronization Framework and related command-line utilities
 email: dev@rhomobile.com
 executables: 
 - rhosync
@@ -263,7 +312,6 @@ files:
 - bench/benchapp/settings/settings.yml
 - bench/benchapp/sources/mock_adapter.rb
 - bench/benchapp/sources/queue_mock_adapter.rb
-- bench/benchapp/vendor/rhosync/lib/rhosync.rb
 - bench/lib/bench.rb
 - bench/lib/bench/cli.rb
 - bench/lib/bench/logging.rb
@@ -455,6 +503,9 @@ files:
 - spec/testdata/upload2.txt
 - spec/user_spec.rb
 - tasks/redis.rake
+- examples/simple/application.rb
+- examples/simple/sources/sample_adapter.rb
+- examples/simple/sources/simple_adapter.rb
 has_rdoc: true
 homepage: http://rhomobile.com/products/rhosync
 licenses: []
@@ -465,16 +516,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -483,10 +538,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Rhosync Server
+summary: RhoSync Synchronization Framework
 test_files: 
 - spec/api/api_helper.rb
 - spec/api/create_client_spec.rb
@@ -552,4 +607,3 @@ test_files:
 - examples/simple/application.rb
 - examples/simple/sources/sample_adapter.rb
 - examples/simple/sources/simple_adapter.rb
-- examples/simple/vendor/rhosync/lib/rhosync.rb

data/bench/benchapp/vendor/rhosync/lib/rhosync.rb

@@ -1,7 +0,0 @@
-
-# We're "vendoring" the rhosync/lib directory here so we can use the working copy of
-# rhosync.  Normally, you would require rhosync as a gem or vendor it here.
-path = File.join(File.dirname(__FILE__),'..','..','..','..','..','lib')
-$:.unshift path
-require File.join(path,'rhosync','server')
-require File.join(path,'rhosync','console','server')

data/examples/simple/vendor/rhosync/lib/rhosync.rb

@@ -1,7 +0,0 @@
-
-# We're "vendoring" the rhosync/lib directory here so we can use the working copy of
-# rhosync.  Normally, you would require rhosync as a gem or vendor it here.
-path = File.join(File.dirname(__FILE__),'..','..','..','..','..','lib')
-$:.unshift path
-require File.join(path,'rhosync','server')
-require File.join(path,'rhosync','console','server')