bin/swivel in swivel-0.0.21 vs bin/swivel in swivel-0.0.96

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
 require 'active_support' # TODO: make it work w/o this
 require 'optparse'
-require File.dirname(__FILE__) + '/../lib/swivel'
 require 'yaml'
+require File.dirname(__FILE__) + '/../lib/swivel'
 
-#require 'ruby-debug'
-#Debugger.start
-
 options = Hash.new
 config = Swivel::Connection::Config.new
 config.load
 config.save
 
@@ -65,16 +62,16 @@
     @swivel = Swivel::Connection.new options
   end
 
   def show resource, id
     resource = resource.pluralize
-    response = @swivel.call "/rest/#{resource}/#{id}"
+    response = @swivel.call "/#{resource}/#{id}"
   end
 
   def list resource, options = Hash.new
     resource = resource.pluralize
-    response = @swivel.call "/rest/#{resource}", options
+    response = @swivel.call "/#{resource}", options
   end
 
   def upload name, options = Hash.new
     filename = options[:filename]
     data_set = @swivel.upload :original_asset_name => filename,
@@ -87,24 +84,16 @@
     puts "uploaded #{data_set.id}"
   end
 
   def append id, options = Hash.new
     filename = options[:filename]
-    data_set = @swivel.append :id => id,
-      :original_asset_name => filename,
-      :original_asset_path => filename,
-      :auto_estimate => true,
-      :data => read(filename)
+    data_set = @swivel.append :id => id, :data => read(filename)
     puts "appended #{data_set.id}"
   end
 
   def replace id, options = Hash.new
     filename = options[:filename]
-    data_set = @swivel.replace :id => id,
-      :original_asset_name => filename,
-      :original_asset_path => filename,
-      :auto_estimate => true,
-      :data => read(filename)
+    data_set = @swivel.replace :id => id, :data => read(filename)
     puts "replaced #{data_set.id}"
   end
 
   private
     def read filename = nil