manifests-vmc-plugin 0.6.1 → 0.6.2.rc1

data/Rakefile

@@ -1,47 +1,39 @@
 require "rake"
+require "rspec/core/rake_task"
 
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "manifests-vmc-plugin/version"
 
+RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
-desc "Run specs"
-task :spec => ["bundler:install", "test:spec"]
-
-desc "Run integration tests"
-task :test => ["bundler:install", "test:integration"]
-
-task :build do
-  sh "gem build manifests-vmc-plugin.gemspec"
-end
-
-task :install => :build do
-  sh "gem install --local manifests-vmc-plugin-#{VMCManifests::VERSION}.gem"
-end
-
-task :uninstall do
-  sh "gem uninstall manifests-vmc-plugin"
-end
-
-task :reinstall => [:uninstall, :install]
+namespace :deploy do
+  def last_staging_sha
+    `git rev-parse latest-staging`.strip
+  end
 
-task :release => :build do
-  sh "gem push manifests-vmc-plugin-#{VMCManifests::VERSION}.gem"
-end
+  def last_release_sha
+    `git rev-parse latest-release`.strip
+  end
 
-namespace "bundler" do
-  desc "Install gems"
-  task "install" do
-    sh("bundle install")
+  def last_staging_ref_was_released?
+    last_staging_sha == last_release_sha
   end
-end
 
-namespace "test" do
-  task "spec" do |t|
-    # nothing
+  task :staging, :version do |_, args|
+    sh "gem bump --push #{"--version #{args.version}" if args.version}" if last_staging_ref_was_released?
+    sh "git tag -f latest-staging"
+    sh "git push origin :latest-staging"
+    sh "git push origin latest-staging"
   end
 
-  task "integration" do |t|
-    sh("cd spec && bundle exec rake spec")
+  task :gem do
+    sh "git fetch"
+    sh "git checkout #{last_staging_sha}"
+    sh "gem release"
+    sh "git tag -f v#{VMCManifests::VERSION}"
+    sh "git tag -f latest-release"
+    sh "git push origin :latest-release"
+    sh "git push origin latest-release"
   end
 end

data/lib/manifests-vmc-plugin/loader/normalizer.rb

@@ -105,6 +105,14 @@ module VMCManifests
       if app.key?("url") && app["url"].nil?
         app["url"] = "none"
       end
+
+      if app.key?("subdomain")
+        if app.key?("host")
+          app.delete("subdomain")
+        else
+          app["host"] = app.delete("subdomain")
+        end
+      end
     end
 
     def toplevel_attributes(manifest)

data/lib/manifests-vmc-plugin/plugin.rb

@@ -116,11 +116,12 @@ class ManifestsPlugin < VMC::App::Base
 
   def push_input_for(app_manifest, input)
     existing_app = client.app_by_name(app_manifest[:name])
+    rebased_input = input.rebase_given(app_manifest)
 
     if !existing_app || input[:reset]
-      input = input.rebase_given(app_manifest)
+      input = rebased_input
     else
-      warn_reset_changes if manifest_differs?(existing_app, input)
+      warn_reset_changes if manifest_differs?(existing_app, rebased_input)
     end
 
     input.merge(

data/lib/manifests-vmc-plugin/version.rb

@@ -1,3 +1,3 @@
 module VMCManifests
-  VERSION = "0.6.1".freeze
+  VERSION = "0.6.2.rc1".freeze
 end

data/spec/manifests-vmc-plugin/loader/normalizer_spec.rb

@@ -27,7 +27,28 @@ describe VMCManifests::Normalizer do
 
       it "sets it to none" do
         expect(subject).to eq(
-          :applications => [{ :path => ".", :url => "none" }])
+          :applications => [{ :path => ".", :url => "none" }]
+        )
+      end
+    end
+
+    context 'with a manifest with a subdomain attribute' do
+      let(:manifest) { { "applications" => { "." => { "subdomain" => "use-this-for-host" } } } }
+
+      it "sets the subdomain key to be host" do
+        expect(subject).to eq(
+          :applications => [{ :path => ".", :host => "use-this-for-host" }]
+        )
+      end
+
+      context "when the host attribute is also set" do
+        let(:manifest) { { "applications" => { "." => { "subdomain" => "dont-use-this-for-host", "host" => "canonical-attribute" } } } }
+
+        it 'does not overwrite an explicit host attribute' do
+          expect(subject).to eq(
+            :applications => [{ :path => ".", :host => "canonical-attribute" }]
+          )
+        end
       end
     end
 

data/spec/manifests-vmc-plugin/loader/plugin_spec.rb

@@ -220,33 +220,6 @@ describe ManifestsPlugin do
                 subject
               end
             end
-
-            context "and --reset was NOT given" do
-              let(:given_hash) { { :name => "a", :instances => "100" } }
-
-              context "and the app settings differ" do
-                let(:app) { fake :app, :name => "a", :memory => 256 }
-
-                it "tells the user to use --reset to apply changes" do
-                  mock(plugin).warn_reset_changes
-                  mock(wrapped).call(anything) do |inputs|
-                    expect(inputs.given).to eq(
-                      :name => "a", :instances => "100")
-                  end
-                  subject
-                end
-              end
-
-              it "does not add the manifest's values to the inputs" do
-                stub(plugin).warn_reset_changes
-                mock(wrapped).call(anything) do |inputs|
-                  expect(inputs.given).to eq(
-                    :name => "a", :instances => "100")
-                end
-
-                subject
-              end
-            end
           end
 
           context "and the app does NOT exist" do
@@ -324,4 +297,69 @@ describe ManifestsPlugin do
       end
     end
   end
-end
+
+  describe "#push_input_for" do
+    context "with an existing app" do
+      before do
+        stub(plugin).from_manifest { "PATH" }
+        app.changes.clear
+      end
+
+      let(:client) { fake_client(:apps => [app]) }
+      let(:manifest_memory) { "256M" }
+      let(:app) { fake :app, :name => "a", :memory => 256 }
+      let(:manifest) { { :name => "a", :memory => manifest_memory } }
+
+      subject { plugin.send(:push_input_for, manifest, inputs) }
+
+      context "with --reset" do
+        let(:inputs_hash) { { :reset => true } }
+
+        context "with changes" do
+          let(:manifest_memory) { "128M" }
+
+          it "applies the changes" do
+            subject[:memory].should == "128M"
+          end
+
+          it "does not ask to set --reset" do
+            dont_allow(plugin).warn_reset_changes
+            subject
+          end
+        end
+
+        context "without changes" do
+          it "does not ask to set --reset" do
+            dont_allow(plugin).warn_reset_changes
+            subject
+          end
+        end
+      end
+
+      context "without --reset" do
+        let(:inputs_hash) { {} }
+
+        context "with changes" do
+          let(:manifest_memory) { "128M" }
+
+          it "asks user to provide --reset" do
+            mock(plugin).warn_reset_changes
+            subject
+          end
+
+          it "does not apply changes" do
+            stub(plugin).warn_reset_changes
+            subject[:memory].should == nil
+          end
+        end
+
+        context "without changes" do
+          it "does not ask to set --reset" do
+            dont_allow(plugin).warn_reset_changes
+            subject
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 3394871731
+  prerelease: 6
   segments: 
   - 0
   - 6
+  - 2
+  - rc
   - 1
-  version: 0.6.1
+  version: 0.6.2.rc1
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-06 00:00:00 Z
+date: 2013-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cfoundry
@@ -136,12 +138,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: manifests-vmc-plugin