paasio 0.3.16.beta.2 → 0.3.16.1

data/lib/cli/commands/apps.rb

@@ -230,8 +230,8 @@ module VMC::Cli::Command
         # check deploy status
         deploy = client.app_most_recent_deploy(appname)
         if deploy && deploy[:sha]
-          unless has_git_commit?(@path, deploy[:sha])
-            unless ask("The last commit in the currently deployed code is:\n  #{deploy[:sha]}.\n\nThe current path doesn't include that commit.\nManually uploading may revert changes.\nContinue anyway?", :default => false)
+          unless has_commit?(app, @path, deploy[:sha])
+            unless ask("The last commit in the currently deployed code is:\n  #{deploy[:sha]}\n\nThe current path doesn't include that commit.\nManually uploading may revert changes.\nContinue anyway?", :default => false)
               exit 0
             end
           end
@@ -247,8 +247,8 @@ module VMC::Cli::Command
           # check deploy status
           deploy = client.app_most_recent_deploy(name)
           if deploy && deploy[:sha]
-            unless has_git_commit?(@application, deploy[:sha])
-              unless ask("The last commit in the currently deployed code is:\n  #{deploy[:sha]}.\n\nThe current path doesn't include that commit.\nManually uploading may revert changes.\nContinue anyway?", :default => false)
+            unless has_commit?(app, @application, deploy[:sha])
+              unless ask("The last commit in the currently deployed code is:\n  #{deploy[:sha]}\n\nThe current path doesn't include that commit.\nManually uploading may revert changes.\nContinue anyway?", :default => false)
                 exit 0
               end
             end
@@ -985,7 +985,7 @@ module VMC::Cli::Command
           :memory => mem_quota
         },
       }
-      manifest[:scm_type] = @options[:scm_type] if @options[:scm_type]
+      manifest[:scm_type] = @options[:scm_type] || 'git' unless @options[:skip_scm]
 
       # Send the manifest to the cloud controller
       client.create_app(appname, manifest)
@@ -1236,12 +1236,25 @@ module VMC::Cli::Command
       $?.success?
     end
 
+    def has_commit?(app, path, sha)
+      case app[:scm_type]
+      when 'git'
+        has_git_commit?(path, sha)
+      when 'hg'
+        has_hg_commit?(path, sha)
+      end
+    end
+
     def has_git_commit?(path, sha)
       result = git("--git-dir=#{File.expand_path(File.join(path, '.git'))} branch --contains #{sha}")
       return false unless $?.success?
       !!(result =~ /^\*\s/)
     end
 
+    def has_hg_commit?(path, sha)
+      true # TODO
+    end
+
     def git(args)
       return "" unless has_git?
       flattened_args = [args].flatten.compact.join(" ")

data/lib/cli/config.rb

@@ -7,7 +7,7 @@ require 'json/pure'
 module VMC::Cli
   class Config
 
-    DEFAULT_TARGET  = 'api.paas.io'
+    DEFAULT_TARGET  = 'https://api.paas.io'
     DEFAULT_SUGGEST = 'paas.io'
 
     TARGET_FILE    = '~/.paasio_target'

data/lib/cli/runner.rb

@@ -88,6 +88,7 @@ class VMC::Cli::Runner
 
       opts.on('--remote REMOTE')   { |r|     @options[:remote] = r }
       opts.on('--scm-type TYPE')   { |t|     @options[:scm_type] = t if t == 'git' || t == 'hg' }
+      opts.on('--skip-scm')        {         @options[:skip_scm] = true }
 
       # deprecated
       opts.on('--exec EXEC')       { |exec|  @options[:exec] = exec }

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.16.beta.2'
+    VERSION = '0.3.16.1'
   end
 end

data/lib/vmc/const.rb

@@ -6,7 +6,7 @@ module VMC
 
   # Targets
   DEFAULT_TARGET = 'https://api.paas.io'
-  DEFAULT_LOCAL_TARGET = 'http://api.paas.io'
+  DEFAULT_LOCAL_TARGET = 'https://api.paas.io'
 
   # General Paths
   INFO_PATH            = 'info'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paasio
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 3
   - 16
-  - beta
-  - 2
-  version: 0.3.16.beta.2
+  - 1
+  version: 0.3.16.1
 platform: ruby
 authors: 
 - PaaS.io
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 -08:00
+date: 2012-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -228,13 +227,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: