kalipso 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,3 +1,4 @@
 Wed, Jan 26, 2011
 - - - - - - - - -
+- Add PK generation
 - Teeny bugfixes about paths

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/kalipso.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kalipso}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "kalipso.gemspec",
     "lib/kalipso.rb",
     "lib/kalipso/cli.rb",
+    "lib/kalipso/public_key.rb",
     "lib/kalipso/site.rb"
   ]
   s.homepage = %q{http://github.com/paulca/kalipso}

data/lib/kalipso.rb

@@ -13,6 +13,7 @@ require 'pathname'
 
 # models
 require 'kalipso/site'
+require 'kalipso/public_key'
 
 # app
 Dir[File.expand_path('app/*/*.rb', __FILE__)].each do |file|
@@ -35,4 +36,14 @@ else
   end
 end
 
-Jaysus::Remote.base_url = "http://#{token}:x@oncalypso.com/api/v1"
+Jaysus::Remote.base_url = "http://#{token}:x@oncalypso.com/api/v1"
+
+if !Jaysus::Local.store_dir.join('keys').exist?
+  key_dir = Jaysus::Local.store_dir.join('keys')
+  key_dir.mkpath unless key_dir.exist?
+  key_path = key_dir.join('id_rsa')
+  public_key_path = key_dir.join('id_rsa.pub')
+  puts "generating and uploading public key"
+  `ssh-keygen -N '' -t rsa -q -f #{key_path.to_s.strip}`
+  Kalipso::PublicKey::Remote.create(:key => public_key_path.read)
+end

data/lib/kalipso/cli.rb

@@ -67,6 +67,23 @@ module Kalipso
       end
     end
     
+    desc "fetch", "download a site and link to to a directory"
+    def fetch(name)
+      site = Site::Remote.find_by_name(name)
+      if site.present?
+        puts "fetching #{site.name}"
+        local_site = Site::Local.find_or_create_by_id(site.id)
+        path = File.expand_path("~/Sites/oncalypso/#{name}")
+        pathname = Pathname.new(path)
+        pathname.mkpath unless pathname.exist?
+        local_site.update_attributes(site.attributes.merge(:path => path))
+        `rsync -arvH -e "ssh -i #{Jaysus::Local.store_dir.join('keys', 'id_rsa')}" sites@diddlydum.com:/home/sites/#{site.name}/ #{path.gsub(/\/+$/, '')}/`
+        puts "Site #{name} downloaded to #{path.gsub(/\/+$/, '')}"
+      else
+        "Site #{name} not found. Maybe try 'kalipso sync'"
+      end
+    end
+    
     desc "upload", "upload a path, eg. kalipso upload SITENAME PATH"
     def upload(name = nil)
       if name.present?
@@ -81,7 +98,8 @@ module Kalipso
         puts "uploading #{name} from #{path}"
         if site.path.present?
           puts "uploading #{site.path} to #{site.name}.oncalypso.com"
-          `rsync -arvH #{site.path.gsub(/\/+$/, '')}/ sites@diddlydum.com:/home/sites/#{site.name}`
+          command = %Q[rsync -arvH -e "ssh -i #{Jaysus::Local.store_dir.join('keys', 'id_rsa')}" #{site.path.gsub(/\/+$/, '')}/ sites@diddlydum.com:/home/sites/#{site.name}]
+          `#{command}`
           puts "#{site.path} uploaded to http://#{site.name}.oncalypso.com"
         else
           puts "You need to link this site first"

data/lib/kalipso/public_key.rb

@@ -0,0 +1,22 @@
+module Kalipso
+  module PublicKey
+  
+    class Base < Jaysus::Base
+      primary_key :id
+      attribute :id
+      attribute :key
+      attribute :user_id
+      attribute :created_at
+      attribute :updated_at
+    end
+  
+    class Local < Base
+      include Jaysus::Local
+    end
+  
+    class Remote < Base
+      include Jaysus::Remote
+    end
+  
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kalipso
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Paul Campbell
@@ -191,6 +191,7 @@ files:
 - kalipso.gemspec
 - lib/kalipso.rb
 - lib/kalipso/cli.rb
+- lib/kalipso/public_key.rb
 - lib/kalipso/site.rb
 - spec/kalipso_spec.rb
 - spec/lib/kalipso/cli_spec.rb