kalipso 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/bin/kalipso

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'kalipso'
+require 'kalipso/cli_init'
 require 'kalipso/cli'
-
 Kalipso::CLI.start

data/kalipso.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kalipso}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   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/cli_init.rb",
     "lib/kalipso/public_key.rb",
     "lib/kalipso/site.rb"
   ]

data/lib/kalipso.rb

@@ -13,37 +13,4 @@ require 'pathname'
 
 # models
 require 'kalipso/site'
-require 'kalipso/public_key'
-
-# app
-Dir[File.expand_path('app/*/*.rb', __FILE__)].each do |file|
-  require file
-end
-
-Jaysus::Local.store_dir = File.expand_path("~/.kalipso")
-Jaysus::Local.store_dir.mkpath unless Jaysus::Local.store_dir.exist?
-
-token_path = Jaysus::Local.store_dir.join('token')
-
-if token_path.exist?
-  token = token_path.read
-else
-  email = ask("Enter your email:  ") { |q| q.echo = true }
-  password = ask("Enter your password:  ") { |q| q.echo = "*" }
-  token = ActiveSupport::JSON.decode(RestClient.get("http://#{CGI.escape(email)}:#{CGI.escape(password)}@oncalypso.com/api/v1/users.json"))['token']
-  token_path.open('w') do |file|
-    file.write token
-  end
-end
-
-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
+require 'kalipso/public_key'

data/lib/kalipso/cli.rb

@@ -1,16 +1,37 @@
 module Kalipso
   class CLI < Thor
 
+    desc "path", "print linked path for a site"
+    def path(name)
+      site = Site::Local.find_by_name(name)
+      if site.present?
+        if site.path.present?
+          puts site.path
+        else
+          puts "Path not present. You need to link this site to a path."
+        end
+      else
+        puts "Could not find site #{name}"
+      end
+    end
+
     desc "create", "add a site"
-    def create(name = nil)
-      path = Dir.pwd
+    def create(name = nil, path = nil)
       if name.present?
-        puts "Creating #{name} linked to #{path}"
+        puts "Creating #{name}"
       else
-        puts "Creating a new site linked to #{path}"
+        puts "Creating a new site"
       end
       begin
-        Site::Remote.create(:name => name)
+        remote_site = Site::Remote.create(:name => name)
+        path = path || File.expand_path("~/Sites/oncalypso/#{remote_site.name}")
+        Site::Local.create({
+          :name => remote_site.name,
+          :id => remote_site.id,
+          :path => path
+        })
+        Pathname.new(path).mkpath unless Pathname.new(path).exist?
+        puts "Site #{remote_site.name} site created and linked to #{path}"
         
       rescue RestClient::UnprocessableEntity
         puts "There was an error uploading your site"
@@ -32,6 +53,20 @@ module Kalipso
       end
     end
     
+    desc "open", "open a site in browser"
+    def open(site = nil)
+      if site.present?
+        site = Site::Local.find_by_name(site)
+      else
+        site = Site::Local.find_by_path(Dir.pwd)
+      end
+      if site.present?
+        `open http://#{site.name}.oncalypso.com`
+      else
+        puts "Could not find site"
+      end
+    end
+    
     desc "link", "link a local path to a site"
     def link(site, path = nil)
       site = Site::Local.find_by_name(site)
@@ -76,7 +111,9 @@ module Kalipso
         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))
+        local_site.name = site.name
+        local_site.path = path
+        local_site.save
         `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
@@ -108,5 +145,10 @@ module Kalipso
         puts "site not found with path #{path}"
       end
     end
+    
+    desc "version", "print the version of the kalipso gem"
+    def version
+      puts File.read(File.expand_path('../../../VERSION', __FILE__))
+    end
   end
 end

data/lib/kalipso/cli_init.rb

@@ -0,0 +1,27 @@
+Jaysus::Local.store_dir = File.expand_path("~/.kalipso")
+Jaysus::Local.store_dir.mkpath unless Jaysus::Local.store_dir.exist?
+
+token_path = Jaysus::Local.store_dir.join('token')
+
+if token_path.exist?
+  token = token_path.read
+else
+  email = ask("Enter your email:  ") { |q| q.echo = true }
+  password = ask("Enter your password:  ") { |q| q.echo = "*" }
+  token = ActiveSupport::JSON.decode(RestClient.get("http://#{CGI.escape(email)}:#{CGI.escape(password)}@oncalypso.com/api/v1/users.json"))['token']
+  token_path.open('w') do |file|
+    file.write token
+  end
+end
+
+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

metadata

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