kalipso 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/kalipso.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kalipso}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]

data/lib/kalipso/cli.rb

@@ -3,7 +3,7 @@ module Kalipso
 
     desc "create", "add a site"
     def create(name = nil)
-      path = File.expand_path(File.dirname(__FILE__))
+      path = File.expand_path(File.dirname($0))
       if name.present?
         puts "Creating #{name} linked to #{path}"
       else
@@ -67,15 +67,25 @@ module Kalipso
     end
     
     desc "upload", "upload a path, eg. kalipso upload SITENAME PATH"
-    def upload(name)
-      puts "uploading #{name}"
-      site = Site::Local.find_by_name(name)
-      if site.path.present?
-        puts "uploading #{site.path} to #{site.name}.diddlydum.com"
-        `rsync -arvH #{site.path.gsub(/\/+$/, '')}/ sites@diddlydum.com:/home/sites/#{site.name}`
-        puts "#{site.path} uploaded to http://#{site.name}.diddlydum.com"
+    def upload(name = nil)
+      if name.present?
+        puts "uploading #{name}"
+        site = Site::Local.find_by_name(name)
+      else
+        path = File.expand_path(File.dirname($0))
+        site = Site::Local.find_by_path(path)
+      end
+      if site.present?
+        puts "uploading #{name} from #{path}"
+        if site.path.present?
+          puts "uploading #{site.path} to #{site.name}.diddlydum.com"
+          `rsync -arvH #{site.path.gsub(/\/+$/, '')}/ sites@diddlydum.com:/home/sites/#{site.name}`
+          puts "#{site.path} uploaded to http://#{site.name}.diddlydum.com"
+        else
+          puts "You need to link this site first"
+        end
       else
-        puts "You need to link this site first"
+        puts "site not found with path #{path}"
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kalipso
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Paul Campbell