nimbu 0.4 → 0.5.1

data/lib/nimbu/server/base.rb

@@ -6,6 +6,7 @@ require 'term/ansicolor'
 require "base64"
 require "sinatra/json"
 require 'json'
+require 'rack/streaming_proxy'
 
 module Nimbu
   module Server
@@ -21,13 +22,18 @@ module Nimbu
       set :method_override, true
       set :static, true                             # set up static file routing
       set :public_folder, Dir.pwd # set up the static dir (with images/js/css inside)
-      
+
       set :views,  File.expand_path('../views', __FILE__) # set up the views dir
       set :haml, { :format => :html5 }                    # if you use haml
-      
+
       # Your "actions" go here…
       #
 
+      get '/media/*' do
+        proxy = Rack::StreamingProxy::ProxyRequest.new(request,"http://#{nimbu.host}/media/#{params[:splat].first}")
+        return [proxy.status, proxy.headers, proxy]
+      end
+
       get '/__sinatra__/*' do
         return ""
       end
@@ -51,7 +57,7 @@ module Nimbu
           if request.get? then "get"
           elsif request.post? then "post"
           elsif request.put? then "put"
-          elsif request.delete? then "delete"  
+          elsif request.delete? then "delete"
           end
         )
         puts green("#{method.upcase} #{request.fullpath}")
@@ -89,7 +95,7 @@ module Nimbu
         #   begin
         #     result = json_decode(nimbu.get_template({:path => path, :extra => params, :method => "get", :extra => params, :client_session => session, :ajax => request.xhr? }))
         #     puts result if Nimbu.debug
-        #     parse_session(result)            
+        #     parse_session(result)
         #   rescue Exception => e
         #     return e.http_body
         #   end
@@ -103,12 +109,12 @@ module Nimbu
             params = ({} || params).merge({:simulator => {
                             :host => request.host,
                             :port => request.port,
-                            :path => path,  
-                            :method => method, 
-                            :session => session, 
+                            :path => path,
+                            :method => method,
+                            :session => session,
                             :headers => request.env.to_json,
                           }})
-            result = json_decode(nimbu.get_template(params))
+            result = nimbu.simulator(:subdomain => Nimbu::Auth.site).recipe(params)
             puts result if Nimbu.debug
           rescue Exception => e
             if e.respond_to?(:http_body)
@@ -117,7 +123,7 @@ module Nimbu
               raise e
             end
           end
-      
+
           if result["template"].nil?
             raise Sinatra::NotFound
           end
@@ -128,10 +134,15 @@ module Nimbu
             puts green(" => using template '#{template}'")
             # Read the template file
             template_file = File.join(Dir.pwd,'templates',template)
+            template_file_haml = File.join(Dir.pwd,'templates',"#{template}.haml")
+
             if File.exists?(template_file)
               template_code = IO.read(template_file)
+            elsif File.exists?(template_file_haml)
+              template_code = IO.read(template_file_haml)
+              template = "#{template}.haml"
             else
-              puts red("Layout file '#{template_file}' is missing...") 
+              puts red("Layout file '#{template_file}' is missing...")
               return render_missing(File.join('templates',template),'template')
             end
 
@@ -150,10 +161,15 @@ module Nimbu
 
             # Read the layout file
             layout_file = File.join(Dir.pwd,'layouts',layout)
+            layout_file_haml = File.join(Dir.pwd,'layouts',"#{layout}.haml")
+
             if File.exists?(layout_file)
               layout_code = IO.read(layout_file)
+            elsif File.exists?(layout_file_haml)
+              layout = "#{layout}.haml"
+              layout_code = IO.read(layout_file_haml)
             else
-              puts red("Layout file '#{layout_file}' is missing...") 
+              puts red("Layout file '#{layout_file}' is missing...")
               return render_missing(File.join('layouts',layout),'layout')
             end
 
@@ -164,7 +180,7 @@ module Nimbu
               snippets = parse_snippets(layout_code,snippets)
             rescue Exception => e
               # If there is a snippet missing, we raise an error
-              puts red("Snippet file '#{e.message}' is missing...") 
+              puts red("Snippet file '#{e.message}' is missing...")
               return render_missing(e.message,'snippet')
             end
 
@@ -179,28 +195,35 @@ module Nimbu
         # Send the templates to the browser
         begin
           params = ({} || params).merge({:simulator => {
-                          :path => path,  
-                          :template => template_code, 
-                          :host => request.host,
-                          :port => request.port,
-                          :layout => layout_code, 
-                          :snippets => snippets, 
-                          :method => method, 
-                          :session => session, 
-                          :headers => request.env.to_json,
+                          :path => path,
+                          :code => {
+                            :template_name => template,
+                            :template => template_code,
+                            :layout_name => layout,
+                            :layout => layout_code,
+                            :snippets => snippets,
+                          },
+                          :request => {
+                            :host => request.host,
+                            :port => request.port,
+                            :method => method,
+                            :session => session,
+                            :headers => request.env.to_json
+                          }
                         }})
-          results = json_decode(nimbu.get_request(params))
+          results = nimbu.simulator(:subdomain => Nimbu::Auth.site).render(params)
           puts results["status"] if Nimbu.debug
           puts results["headers"] if Nimbu.debug
-          puts results["body"].gsub(/\n/,'') if Nimbu.debug
+          puts Base64.decode64(results["body"]).gsub(/\n/,'') if Nimbu.debug
 
           status results["status"]
           headers results["headers"] unless results["headers"] == ""
-          body results["body"]
-        rescue RestClient::Exception => error
+          body Base64.decode64(results["body"])
+        rescue Exception => error
+          puts "Error!"
           puts "Error! #{error.http_body}"
           html = error.http_body
-        end          
+        end
       end
 
       error 404 do
@@ -256,25 +279,11 @@ module Nimbu
       rescue Nimbu::OkJson::ParserError
         nil
       end
-      
+
       def nimbu
         Nimbu::Auth.client
       end
 
-      # def parse_session(response)
-      #   if !response["session"].nil?
-      #     response["session"].each do |key,value|
-      #       session[key.to_sym] = value
-      #       #puts "Session: :#{key} => #{value}" if Nimbu.debug
-      #     end
-      #     session.each do |key,value|
-      #       if !response["session"].has_key?(key.to_s)
-      #         session.delete(key)
-      #       end
-      #     end
-      #   end
-      # end
-
       def parse_snippets(code, snippets = {})
         # Parse template file for snippets
         search = Regexp.new("\{\% include (.*) \%\}")
@@ -288,10 +297,16 @@ module Nimbu
             end
             # Read the snippet file
             snippet_file = File.join(Dir.pwd,'snippets',snippet_name)
+            snippet_file_haml = File.join(Dir.pwd,'snippets',"#{snippet_name}.haml")
+
             if File.exists?(snippet_file)
               snippet_code = IO.read(snippet_file)
               snippets[snippet_name.to_sym] = snippet_code
               self.parse_snippets(snippet_code, snippets)
+            elsif File.exists?(snippet_file_haml)
+              snippet_code = IO.read(snippet_file_haml)
+              snippets["#{snippet_name}.haml".to_sym] = snippet_code
+              self.parse_snippets(snippet_code, snippets)
             else
               raise "#{snippet_file}"
             end

data/lib/nimbu/ssh.rb

@@ -0,0 +1,54 @@
+require "yaml"
+require "nimbu"
+require "nimbu/helpers"
+
+class Nimbu::Auth
+  class << self
+
+    include Nimbu::Helpers
+    def check_for_associated_ssh_key
+      return unless client.keys.empty?
+      associate_or_generate_ssh_key
+    end
+
+    def associate_or_generate_ssh_key
+      public_keys = Dir.glob("#{home_directory}/.ssh/*.pub").sort
+
+      case public_keys.length
+      when 0 then
+        display "Could not find an existing public key."
+        display "Would you like to generate one? [Yn] ", false
+        unless ask.strip.downcase == "n"
+          display "Generating new SSH public key."
+          generate_ssh_key("id_rsa")
+          associate_key("#{home_directory}/.ssh/id_rsa.pub")
+        end
+      when 1 then
+        display "Found existing public key: #{public_keys.first}"
+        associate_key(public_keys.first)
+      else
+        display "Found the following SSH public keys:"
+        public_keys.each_with_index do |key, index|
+          display "#{index+1}) #{File.basename(key)}"
+        end
+        display "Which would you like to use with your Nimbu account? ", false
+        chosen = public_keys[ask.to_i-1] rescue error("Invalid choice")
+        associate_key(chosen)
+      end
+    end
+
+    def generate_ssh_key(keyfile)
+      ssh_dir = File.join(home_directory, ".ssh")
+      unless File.exists?(ssh_dir)
+        FileUtils.mkdir_p ssh_dir
+        File.chmod(0700, ssh_dir)
+      end
+      `ssh-keygen -t rsa -N "" -f \"#{home_directory}/.ssh/#{keyfile}\" 2>&1`
+    end
+
+    def associate_key(key)
+      display "Uploading SSH public key #{key}"
+      client.add_key(File.read(key))
+    end
+  end
+end

data/lib/nimbu/version.rb

@@ -1,3 +1,3 @@
 module Nimbu
-  VERSION = "0.4"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,66 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: '0.4'
   prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.5
-  type: :runtime
+  name: term-ansicolor
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.5
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: nimbu-api
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0'
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: launchy
+        version: '0'
+  name: rubyzip
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0'
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: rubyzip
+        version: '0'
+  name: sinatra
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -68,15 +75,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
+  name: sinatra-contrib
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -84,15 +91,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: listen
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -100,15 +107,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: compass
+  name: thin
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -116,15 +123,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
+  name: rack-streaming-proxy
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -132,49 +139,122 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  name: bundler
   prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fssm
+  name: rake
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: awesome_print
   prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: thin
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: pry-remote
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: pry-stack_explorer
   prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry-debugger
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
 description: Client library and command-line tool to design and manage websites on
   the Nimbu platform.
 email:
-- support@getnimbu.com
+- support@nimbu.io
 executables:
 - nimbu
 extensions: []
@@ -184,22 +264,22 @@ files:
 - lib/nimbu.rb
 - lib/nimbu/auth.rb
 - lib/nimbu/cli.rb
-- lib/nimbu/client.rb
-- lib/nimbu/client/rendezvous.rb
 - lib/nimbu/command.rb
 - lib/nimbu/command/auth.rb
 - lib/nimbu/command/base.rb
+- lib/nimbu/command/browse.rb
 - lib/nimbu/command/help.rb
 - lib/nimbu/command/helpers.rb
 - lib/nimbu/command/init.rb
 - lib/nimbu/command/server.rb
+- lib/nimbu/command/sites.rb
 - lib/nimbu/command/themes.rb
 - lib/nimbu/helpers.rb
 - lib/nimbu/server/base.rb
-- lib/nimbu/server/views/index.haml
+- lib/nimbu/ssh.rb
 - lib/nimbu/version.rb
 - lib/vendor/nimbu/okjson.rb
-homepage: http://www.getnimbu.com
+homepage: https://www.nimbu.io
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -210,16 +290,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 4171643488340786911
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 4171643488340786911
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to design websites on the Nimbu platform.