bosh-cloudfoundry 0.5.0 → 0.5.1

data/ChangeLog.md

@@ -12,6 +12,10 @@ In future, when cf-release eventually merges all the required patches into maste
 
 And finally, the big requirement for going v1.0, is for all the required patches to be included in a final release of cf-release.
 
+### v0.5.1
+
+Fixes a bug in creating dev releases of cf-release based on branches that aren't "master". It now correctly clones each staging branch into its own repository, built solely off the targeted branch.
+
 ## v0.4
 
 Defaults to patched dev release (since a cf-release final release doesn't work).

data/lib/bosh-cloudfoundry.rb

@@ -26,7 +26,6 @@ require 'fog/aws/models/compute/flavors'
 # CLI mixins
 require "bosh-cloudfoundry/config_options"
 require "bosh-cloudfoundry/bosh_release_manager"
-require "bosh-cloudfoundry/gerrit_patches_helper"
 
 require "bosh-cloudfoundry/config"
 require "bosh-cloudfoundry/providers"

data/lib/bosh-cloudfoundry/bosh_release_manager.rb

@@ -43,7 +43,7 @@ module Bosh::CloudFoundry::BoshReleaseManager
     release_number = use_latest_release? ? 
       latest_uploadable_final_release_number :
       release_version
-    chdir(cf_release_dir) do
+    chdir(cf_release_branch_dir) do
       bosh_cmd "upload release releases/appcloud-#{release_number}.yml"
     end
     @bosh_releases = nil # reset cache
@@ -53,7 +53,7 @@ module Bosh::CloudFoundry::BoshReleaseManager
   # for the latest release number that could be uploaded
   # @returns [String] a number such as "126"
   def latest_uploadable_final_release_number
-    chdir(cf_release_dir) do
+    chdir(cf_release_branch_dir) do
       return `tail -n 1 releases/index.yml | awk '{print $2}'`.strip
     end
   end
@@ -62,7 +62,7 @@ module Bosh::CloudFoundry::BoshReleaseManager
   # for the latest release number that could be uploaded
   # @returns [String] a dev release code such as "126.8-dev"
   def latest_uploadable_dev_release_number
-    chdir(cf_release_dir) do
+    chdir(cf_release_branch_dir) do
       return `tail -n 1 dev_releases/index.yml | awk '{print $2}'`.strip
     end
   end
@@ -76,7 +76,7 @@ module Bosh::CloudFoundry::BoshReleaseManager
 
   def create_and_upload_dev_release
     release_name = default_dev_release_name
-    chdir(cf_release_dir) do
+    chdir(cf_release_branch_dir) do
       write_dev_config_file(release_name)
       sh "bosh -n --color create release --with-tarball --force"
       sh "bosh -n --color upload release"
@@ -107,11 +107,11 @@ module Bosh::CloudFoundry::BoshReleaseManager
     raise "invoke #set_cf_release_branch(branch) first" unless cf_release_branch_dir
     if File.directory?(cf_release_branch_dir)
       chdir(cf_release_branch_dir) do
-        sh "git pull origin #{cf_release_branch} --no-recurse-submodules" # recursive is below
+        sh "git pull origin #{cf_release_branch}" # recursive is below
       end
     else
       chdir(releases_dir) do
-        sh "git clone #{cf_release_git_repo} #{cf_release_branch_dir}"
+        sh "git clone -b #{cf_release_branch} #{cf_release_git_repo} #{cf_release_branch_dir}"
         chdir(cf_release_branch_dir) do
           sh "git update-index --assume-unchanged config/final.yml 2>/dev/null"
         end

data/lib/bosh-cloudfoundry/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cloudfoundry
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/bosh/cli/commands/cf.rb

@@ -8,7 +8,6 @@ module Bosh::Cli::Command
     include Bosh::Cli::VersionCalc
     include Bosh::CloudFoundry::ConfigOptions
     include Bosh::CloudFoundry::BoshReleaseManager
-    include Bosh::CloudFoundry::GerritPatchesHelper
     include FileUtils
 
     usage "cf"

data/spec/unit/bosh_release_manager_spec.rb

@@ -22,7 +22,7 @@ describe Bosh::CloudFoundry::BoshReleaseManager do
     self.cf_release_branch     = "master"
     self.cf_release_branch_dir = File.join(cf_release_dir, "master")
     mkdir_p(cf_release_branch_dir)
-    should_receive(:sh).with("git pull origin master --no-recurse-submodules")
+    should_receive(:sh).with("git pull origin master")
     should_receive(:sh).with("sed -i 's#git@github.com:#https://github.com/#g' .gitmodules")
     should_receive(:sh).with("sed -i 's#git://github.com#https://github.com#g' .gitmodules")
     should_receive(:sh).with("git submodule update --init --recursive")
@@ -33,7 +33,7 @@ describe Bosh::CloudFoundry::BoshReleaseManager do
     self.cf_release_branch     = "staging"
     self.cf_release_branch_dir = File.join(cf_release_dir, "staging")
     mkdir_p(cf_release_branch_dir)
-    should_receive(:sh).with("git pull origin staging --no-recurse-submodules")
+    should_receive(:sh).with("git pull origin staging")
     should_receive(:sh).with("sed -i 's#git@github.com:#https://github.com/#g' .gitmodules")
     should_receive(:sh).with("sed -i 's#git://github.com#https://github.com#g' .gitmodules")
     should_receive(:sh).with("git submodule update --init --recursive")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-cloudfoundry
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -119,7 +119,6 @@ files:
 - lib/bosh-cloudfoundry/config/redis_service_config.rb
 - lib/bosh-cloudfoundry/config/system_config.rb
 - lib/bosh-cloudfoundry/config_options.rb
-- lib/bosh-cloudfoundry/gerrit_patches_helper.rb
 - lib/bosh-cloudfoundry/providers.rb
 - lib/bosh-cloudfoundry/providers/aws.rb
 - lib/bosh-cloudfoundry/providers/openstack.rb
@@ -161,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3552248026887533179
+      hash: -2872187592937084659
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -170,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3552248026887533179
+      hash: -2872187592937084659
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/bosh-cloudfoundry/gerrit_patches_helper.rb

@@ -1,47 +0,0 @@
-# Copyright (c) 2012-2013 Stark & Wayne, LLC
-
-module Bosh; module CloudFoundry; end; end
-
-# There are two concepts of "latest".
-# * for upload: "latest" is the highest release in cf-release
-# * for manifest creation: "latest" is the highest release already uploaded to the BOSH
-module Bosh::CloudFoundry::GerritPatchesHelper
-
-  def extract_refs_change(gerrit_change)
-    if gerrit_change =~ %r{(\d+)/(\d+)/(\d+)$}
-      "#{$1}/#{$2}/#{$3}"
-    else
-      nil
-    end
-  end
-
-  def add_gerrit_refs_change(refs_change)
-    system_config.gerrit_changes ||= []
-    unless system_config.gerrit_changes.include?(refs_change)
-      system_config.gerrit_changes << refs_change
-      system_config.save
-    end
-  end
-  
-  def apply_gerrit_patches
-    # is the gerrit setup necessary; or can use anonymous HTTP?
-    # confirm_gerrit_username # http://reviews.cloudfoundry.org/#/settings/
-    # confirm_user_added_vcap_ssh_keys_to_gerrit # http://reviews.cloudfoundry.org/#/settings/ssh-keys
-    # confirm_ssh_access # ssh -p 29418 drnic@reviews.cloudfoundry.org 2>&1 | grep "Permission denied"
-    create_and_change_into_patches_branch
-    ssh_uri = "http://reviews.cloudfoundry.org/cf-release"
-    chdir(cf_release_dir) do
-      system_config.gerrit_changes.each do |refs_change|
-        sh "git pull #{ssh_uri} refs/changes/#{refs_change}"
-      end
-    end
-  end
-
-  def create_and_change_into_patches_branch
-    chdir(cf_release_dir) do
-      sh "git checkout master"
-      sh "git branch -f patches" # force create
-      sh "git checkout patches"
-    end
-  end
-end