vmc 0.3.12 → 0.3.13.beta.1

data/lib/cli/commands/apps.rb

@@ -202,10 +202,16 @@ module VMC::Cli::Command
       app = client.app_info(appname)
       services_to_delete = []
       app_services = app[:services]
+      services_apps_hash = provisioned_services_apps_hash
       app_services.each { |service|
         del_service = force && no_prompt ? 'Y' : 'N'
         unless no_prompt || force
-          del_service = ask("Provisioned service [#{service}] detected, would you like to delete it? [yN]: ")
+          apps_using_service = services_apps_hash[service].reject!{ |app| app == appname}
+          if apps_using_service.size > 0
+            del_service = ask("Provisioned service [#{service}] is being used by #{apps_using_service.entries}, would you still like to delete it? [yN]: ")
+          else
+            del_service = ask("Provisioned service [#{service}] detected, would you like to delete it? [yN]: ")
+          end
         end
         services_to_delete << service if del_service.upcase == 'Y'
       }
@@ -213,10 +219,12 @@ module VMC::Cli::Command
       client.delete_app(appname)
       display 'OK'.green
 
-      services_to_delete.each do |s|
-        display "Deleting service [#{s}]: ", false
-        client.delete_service(s)
-        display 'OK'.green
+      unless services_to_delete.length == 0
+        services_to_delete.each do |s|
+          display "Deleting service [#{s}]: ", false
+          client.delete_service(s)
+          display 'OK'.green
+        end
       end
     end
 
@@ -697,6 +705,22 @@ module VMC::Cli::Command
       end
     end
 
+    def provisioned_services_apps_hash
+      apps = client.apps
+      services_apps_hash = {}
+      apps.each {|app|
+        app[:services].each { |svc|
+          svc_apps = services_apps_hash[svc]
+          unless svc_apps
+            svc_apps = Set.new
+            services_apps_hash[svc] = svc_apps
+          end
+          svc_apps.add(app[:name])
+        } unless app[:services] == nil
+      }
+      services_apps_hash
+    end
+
     def check_app_limit
       usage = client_info[:usage]
       limits = client_info[:limits]

data/lib/cli/commands/misc.rb

@@ -30,7 +30,7 @@ module VMC::Cli::Command
       client = VMC::Client.new(target_url)
       unless client.target_valid?
         if prompt_ok
-          display "Host is not valid: '#{target_url}'".red
+          display "Host is not available or is not valid: '#{target_url}'".red
           show_response = ask "Would you like see the response [yN]? "
           display "\n<<<\n#{client.raw_info}\n>>>\n" if show_response.upcase == 'Y'
         end

data/lib/cli/commands/user.rb

@@ -12,7 +12,7 @@ module VMC::Cli::Command
     def login(email=nil)
       email    = @options[:email] unless email
       password = @options[:password]
-      tries = 0
+      tries ||= 0
       email = ask("Email: ") unless no_prompt || email
       password = ask("Password: ") {|q| q.echo = '*'} unless no_prompt || password
       err "Need a valid email" unless email

data/lib/cli/config.rb

@@ -26,7 +26,7 @@ module VMC::Cli
         return @target_url if @target_url
         target_file = File.expand_path(TARGET_FILE)
         if File.exists? target_file
-          @target_url = File.read(target_file).strip!
+          @target_url = lock_and_read(target_file).strip!
           ha = @target_url.split('.')
           ha.shift
           @suggest_url = ha.join('.')
@@ -42,14 +42,13 @@ module VMC::Cli
 
       def store_target(target_host)
         target_file = File.expand_path(TARGET_FILE)
-        File.open(target_file, 'w+') { |f| f.puts target_host }
-        FileUtils.chmod 0600, target_file
+        lock_and_write(target_file, target_host)
       end
 
       def all_tokens
         token_file = File.expand_path(TOKEN_FILE)
         return nil unless File.exists? token_file
-        contents = File.read(token_file).strip
+        contents = lock_and_read(token_file).strip
         JSON.parse(contents)
       end
 
@@ -69,20 +68,19 @@ module VMC::Cli
         tokens = all_tokens || {}
         tokens[target_url] = token
         token_file = File.expand_path(TOKEN_FILE)
-        File.open(token_file, 'w+') { |f| f.write(tokens.to_json) }
-        FileUtils.chmod 0600, token_file
+        lock_and_write(token_file, tokens.to_json)
       end
 
       def instances
         instances_file = File.expand_path(INSTANCES_FILE)
         return nil unless File.exists? instances_file
-        contents = File.read(instances_file).strip
+        contents = lock_and_read(instances_file).strip
         JSON.parse(contents)
       end
 
       def store_instances(instances)
         instances_file = File.expand_path(INSTANCES_FILE)
-        File.open(instances_file, 'w') { |f| f.write(instances.to_json) }
+        lock_and_write(instances_file, instances.to_json)
       end
 
       def aliases
@@ -100,6 +98,25 @@ module VMC::Cli
         File.open(aliases_file, 'wb') {|f| f.write(aliases.to_yaml)}
       end
 
+      def lock_and_read(file)
+        File.open(file, "r") {|f|
+          f.flock(File::LOCK_EX)
+          contents = f.read
+          f.flock(File::LOCK_UN)
+          contents
+        }
+      end
+
+      def lock_and_write(file, contents)
+        File.open(file, File::RDWR | File::CREAT, 0600) {|f|
+          f.flock(File::LOCK_EX)
+          f.rewind
+          f.puts contents
+          f.flush
+          f.truncate(f.pos)
+          f.flock(File::LOCK_UN)
+        }
+      end
     end
 
     def initialize(work_dir = Dir.pwd)

data/lib/cli/frameworks.rb

@@ -10,11 +10,13 @@ module VMC::Cli
       'Spring'   => ['spring',  { :mem => '512M', :description => 'Java SpringSource Spring Application'}],
       'Grails'   => ['grails',  { :mem => '512M', :description => 'Java SpringSource Grails Application'}],
       'Lift'   =>   ['lift',    { :mem => '512M', :description => 'Scala Lift Application'}],
-      'Roo'      => ['spring',  { :mem => '512M', :description => 'Java SpringSource Roo Application'}],
       'JavaWeb'  => ['spring',  { :mem => '512M', :description => 'Java Web Application'}],
       'Sinatra'  => ['sinatra', { :mem => '128M', :description => 'Sinatra Application'}],
       'Node'     => ['node',    { :mem => '64M',  :description => 'Node.js Application'}],
-      'Erlang/OTP Rebar' => ['otp_rebar',  { :mem => '64M',  :description => 'Erlang/OTP Rebar Application'}]
+      'PHP'      => ['php',     { :mem => '128M', :description => 'PHP Application'}],
+      'Erlang/OTP Rebar' => ['otp_rebar',  { :mem => '64M',  :description => 'Erlang/OTP Rebar Application'}],
+      'WSGI'     => ['wsgi',    { :mem => '64M',  :description => 'Python WSGI Application'}],
+      'Django'   => ['django',  { :mem => '128M', :description => 'Python Django Application'}],
     }
 
     class << self
@@ -35,9 +37,14 @@ module VMC::Cli
             return Framework.lookup('Rails')
 
           # Java
-          elsif Dir.glob('*.war').first
+          elsif Dir.glob('*.war').first || File.exist?('WEB-INF/web.xml')
             war_file = Dir.glob('*.war').first
-            contents = ZipUtil.entry_lines(war_file)
+
+            if war_file
+              contents = ZipUtil.entry_lines(war_file)
+            else
+              contents = Dir['**/*'].join("\n")
+            end
 
             # Spring/Lift Variations
             if contents =~ /WEB-INF\/lib\/grails-web.*\.jar/
@@ -51,7 +58,6 @@ module VMC::Cli
             else
               return Framework.lookup('JavaWeb')
             end
-
           # Simple Ruby Apps
           elsif !Dir.glob('*.rb').empty?
             matched_file = nil
@@ -74,9 +80,23 @@ module VMC::Cli
               return Framework.lookup('Node')
             end
 
+          # PHP
+          elsif !Dir.glob('*.php').empty?
+            return Framework.lookup('PHP')
+
           # Erlang/OTP using Rebar
           elsif !Dir.glob('releases/*/*.rel').empty? && !Dir.glob('releases/*/*.boot').empty?
             return Framework.lookup('Erlang/OTP Rebar')
+
+          # Python Django
+          # XXX: not all django projects keep settings.py in top-level directory
+          elsif File.exist?('manage.py') && File.exist?('settings.py')
+            return Framework.lookup('Django')
+
+          # Python
+          elsif !Dir.glob('wsgi.py').empty?
+            return Framework.lookup('WSGI')
+
           end
         end
         nil

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.12'
+    VERSION = '0.3.13.beta.1'
   end
 end

data/lib/vmc/client.rb

@@ -25,7 +25,7 @@ class VMC::Client
   attr_accessor :trace
 
   # Error codes
-  VMC_HTTP_ERROR_CODES = [ 400, 403, 404, 500 ]
+  VMC_HTTP_ERROR_CODES = [ 400, 500 ]
 
   # Errors
   class BadTarget <  RuntimeError; end
@@ -369,7 +369,7 @@ class VMC::Client
     }
     status, body, response_headers = perform_http_request(req)
 
-    if VMC_HTTP_ERROR_CODES.include?(status)
+    if request_failed?(status)
       # FIXME, old cc returned 400 on not found for file access
       err = (status == 404 || status == 400) ? NotFound : TargetError
       raise err, parse_error_message(status, body)
@@ -380,6 +380,10 @@ class VMC::Client
     raise BadTarget, "Cannot access target (%s)" % [ e.message ]
   end
 
+  def request_failed?(status)
+    VMC_HTTP_ERROR_CODES.detect{|error_code| status >= error_code}
+  end
+
   def perform_http_request(req)
     proxy_uri = URI.parse(req[:url]).find_proxy()
     RestClient.proxy = proxy_uri.to_s if proxy_uri

data/spec/assets/node/app.js

@@ -0,0 +1,16 @@
+var http = require('http');
+var url = require('url');
+
+HOST = null;
+
+var host = process.env.VCAP_APP_HOST || 'localhost';
+var port = process.env.VCAP_APP_PORT || 3000
+
+http.createServer(function (req, res) {
+  res.writeHead(200, {'Content-Type': 'text/html'});
+  res.write('<h1>Hello from the Cloud! ');
+  res.write('via: ' + host + ':' + port);
+  res.end('</h1>');
+}).listen(port, null);
+
+console.log('Server running at http://' + host + ':' + port + '/');

data/spec/assets/rails3/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+gem 'rails', '~> 3.0.5'
+# Without any bound services, app runs on sqlite3
+gem 'sqlite3'
+#.. but may also be staged with mysql
+gem 'mysql2'
+gem 'thin'
+gem 'ffi' # let's make it challenging

data/spec/assets/rails3/README

@@ -0,0 +1,256 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+       <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+       "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install ruby-debug to run the server in debugging
+mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.find(:all)
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8
+          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+       #<Post:0x14a6620
+          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+  made to the database.
+* Passing an environment name as an argument will load the corresponding
+  environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.com/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+  |-- app
+  |   |-- controllers
+  |   |-- helpers
+  |   |-- models
+  |   `-- views
+  |       `-- layouts
+  |-- config
+  |   |-- environments
+  |   |-- initializers
+  |   `-- locales
+  |-- db
+  |-- doc
+  |-- lib
+  |   `-- tasks
+  |-- log
+  |-- public
+  |   |-- images
+  |   |-- javascripts
+  |   `-- stylesheets
+  |-- script
+  |   `-- performance
+  |-- test
+  |   |-- fixtures
+  |   |-- functional
+  |   |-- integration
+  |   |-- performance
+  |   `-- unit
+  |-- tmp
+  |   |-- cache
+  |   |-- pids
+  |   |-- sessions
+  |   `-- sockets
+  `-- vendor
+      `-- plugins
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from
+  ApplicationController which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb. Models descend from
+  ActiveRecord::Base by default.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use
+  eRuby syntax by default.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the
+  common header/footer method of wrapping views. In your views, define a layout
+  using the <tt>layout :default</tt> and create a file named default.html.erb.
+  Inside default.html.erb, call <% yield %> to render the view using this
+  layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are
+  generated for you automatically when using generators for controllers.
+  Helpers can be used to wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database,
+  and other dependencies.
+
+db
+  Contains the database schema in schema.rb. db/migrate contains all the
+  sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when
+  generated using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that
+  doesn't belong under controllers, models, or helpers. This directory is in
+  the load path.
+
+public
+  The directory available for the web server. Contains subdirectories for
+  images, stylesheets, and javascripts. Also contains the dispatchers and the
+  default HTML files. This should be set as the DOCUMENT_ROOT of your web
+  server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the rails generate
+  command, template test files will be generated for you and placed in this
+  directory.
+
+vendor
+  External libraries that the application depends on. Also includes the plugins
+  subdirectory. If the app has frozen rails, those gems also go here, under
+  vendor/rails/. This directory is in the load path.