moonshot 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8889da0008af3d77a443464223983f148141bbb
-  data.tar.gz: e2e9760d81c2c9b0a448b1ca489d9f7f9ec080a8
+  metadata.gz: d67cb66c5dd32a605e63ad9c2878ba6148786aeb
+  data.tar.gz: ca5974cfe33c7a40d1040984017d5180e67a1da7
 SHA512:
-  metadata.gz: 7458636f1cc8d0f00ce9201bfbbcb4205c022226cd3aa8d56a38bba4d87c1a4882b4402cb7fff126e7bce6c241a2944f97b2d9274a6d8e58b0ad262a5694ae9e
-  data.tar.gz: 16321c8a1995e6e3b5c3cb031623b50a157b3b187be722c706ef42fb395308fa720472e8237008057e62a777ee426f6d9460f99d3a1da51395551c1392ed469f
+  metadata.gz: 970d41d6ae16a11f8285381efe2f22a8b9c47fae952e9a860c713bb3aabf57af6e4fc241ccbe72e1640b5a06edea0fc6acdc88db1148a24d03c685eabaecb92f
+  data.tar.gz: dde9fcf2087fdd0aa7918079aa51944b9409567866ab174a0e0c8ab5320b2dbc9ec6adb6257d6edc807b7351063e1c61e640d50c6dee9f0a7d545c0746425370

data/lib/moonshot/build_mechanism/github_release.rb

@@ -76,10 +76,40 @@ module Moonshot::BuildMechanism
     end
 
     def git_tag(tag, sha, annotation)
+      return if git_tag_exists(tag, sha)
+
       cmd = "git tag -a #{tag} #{sha} --file=-"
       sh_step(cmd, stdin: annotation)
     end
 
+    # Determines if a valid git tag already exists.
+    #
+    # @param tag [String] Tag to check existence for.
+    # @param sha [String] SHA to verify the tag against.
+    #
+    # @return [Boolean] Whether or not the tag exists.
+    #
+    # @raise [RuntimeError] if the SHAs do not match.
+    def git_tag_exists(tag, sha)
+      exists = false
+      sh_step("git tag -l #{tag}") do |_, output|
+        exists = (output.strip == tag)
+      end
+
+      # If the tag does exist, make sure the existing SHA matches the SHA we're
+      # trying to build from.
+      if exists
+        sh_step("git rev-list -n 1 #{tag}") do |_, output|
+          raise "#{tag} already exists at a different SHA" \
+            if output.strip != sha
+        end
+
+        log.info("tag #{tag} already exists")
+      end
+
+      exists
+    end
+
     def git_push_tag(remote, tag)
       cmd = "git push #{remote} refs/tags/#{tag}:refs/tags/#{tag}"
       sh_step(cmd) do
@@ -88,6 +118,8 @@ module Moonshot::BuildMechanism
     end
 
     def hub_create_release(semver, commitish, changelog_entry)
+      return if hub_release_exists(semver, commitish)
+
       message = "#{semver}\n\n#{changelog_entry}"
       cmd = "hub release create #{semver} --commitish=#{commitish}"
       cmd << ' --prerelease' if semver.pre || semver.build
@@ -95,6 +127,19 @@ module Moonshot::BuildMechanism
       sh_step(cmd)
     end
 
+    # Determines if a github release already exists.
+    #
+    # @param semver [String] Semantic version string for the release.
+    #
+    # @return [Boolean]
+    def hub_release_exists(semver)
+      sh_step("hub release show #{semver}")
+      log.info("release #{semver} already exists")
+      true
+    rescue RuntimeError
+      false
+    end
+
     def validate_commit
       cmd = "git show --stat #{@sha}"
       sh_step(cmd, msg: "Validate commit #{@sha}.") do |_, out|

data/lib/moonshot/build_mechanism/travis_deploy.rb

@@ -8,6 +8,8 @@ module Moonshot::BuildMechanism
     include Moonshot::DoctorHelper
     include Moonshot::Shell
 
+    MAX_BUILD_FIND_ATTEMPTS = 10
+
     attr_reader :output_file
 
     def initialize(slug, pro: false)
@@ -33,13 +35,46 @@ module Moonshot::BuildMechanism
     def find_build_and_job(version)
       job_number = nil
       ilog.start_threaded('Find Travis CI build') do |step|
-        sleep 2
-        build_out = sh_out("bundle exec travis show #{@cli_args} #{version}")
+        job_number = wait_for_build(version)
+
+        step.success("Travis CI ##{job_number.gsub(/\..*/, '')} running.")
+      end
+      job_number
+    end
+
+    # Looks for the travis build and attempts to retry if the build does not
+    # exist yet.
+    #
+    # @param verison [String] Build version to look for.
+    #
+    # @return [String] Job number for the travis build.
+    def wait_for_build(version)
+      job_number = nil
+      attempts = 0
+      loop do
+        # Give travis some time to start the build.
+        attempts += 1
+        sleep 10
+
+        # Attempt to find the build. Rescue and re-attempt if the build can not
+        # be found on travis yet.
+        begin
+          build_out = sh_out("bundle exec travis show #{@cli_args} #{version}")
+        rescue RuntimeError => e
+          next unless attempts >= MAX_BUILD_FIND_ATTEMPTS
+          raise e
+        end
+
         unless (job_number = build_out.match(/^#(\d+\.\d+) .+BUILD=1.+/)[1])
+          next unless attempts >= MAX_BUILD_FIND_ATTEMPTS
           raise "Build for #{version} not found.\n#{build_out}"
         end
-        step.success("Travis CI ##{job_number.gsub(/\..*/, '')} running.")
+
+        # If we've reached this point then everything went smoothly and we can
+        # exit the loop.
+        break
       end
+
       job_number
     end
 

data/lib/moonshot/cli.rb

@@ -47,6 +47,24 @@ module Moonshot
         base.include(Moonshot::BuildMechanism)
         base.include(Moonshot::DeploymentMechanism)
       end
+
+      def ssh_options!
+        option :user, default: ENV['MOONSHOT_SSH_USER'] || ENV['USER'], type: :string,
+                      aliases: '-l',
+                      desc: 'Specifies the user to log in as on the remote machine.'
+        option :identity_file, default: ENV['MOONSHOT_SSH_KEY_FILE'], type: :string,
+                               aliases: '-i',
+                               desc: 'Selects a file from which the identity (private key) for '\
+                                     'public key authentication is read.'
+        option :instance, default: nil, type: :string, aliases: '-s',
+                          desc: 'Connect to specified instance ID instead of the first one.'
+        option :command, default: nil, type: :string, aliases: '-c',
+                         desc: 'Execute the specified command instead of opening a shell.'
+        option :auto_scaling_group, default: nil, type: :string, aliases: '-g',
+                                    desc: 'The logical ID of the auto scaling group to SSH into. '\
+                                    'Mandatory if the stack has multiple ASGs, '\
+                                    'ignored if you have only one.'
+      end
     end
 
     def initialize(*args)
@@ -91,6 +109,12 @@ module Moonshot
           parameter_strategy = options[:parameter_strategy] || self.class.default_parameter_strategy
           config.parameter_strategy = parameter_strategy_factory(parameter_strategy) \
             unless parameter_strategy.nil?
+
+          config.ssh_user = options[:user]
+          config.ssh_identity_file = options[:identity_file]
+          config.ssh_instance = options[:instance]
+          config.ssh_command = options[:command]
+          config.ssh_auto_scaling_group_name = options[:auto_scaling_group]
         end
       rescue => e
         raise Thor::Error, e.message
@@ -106,6 +130,12 @@ module Moonshot
           raise Thor::Error, "Unknown parameter strategy: #{value}"
         end
       end
+
+      def ssh_command(command)
+        arguments = ARGV.drop(1)
+        arguments += ['--command', command]
+        invoke :ssh, [], arguments
+      end
     end
 
     desc :list, 'List stacks for this application.'
@@ -180,5 +210,11 @@ module Moonshot
       success = controller.doctor
       raise Thor::Error, 'One or more checks failed.' unless success
     end
+
+    desc :ssh, 'SSH into the first or specified instance on the stack.'
+    ssh_options!
+    def ssh
+      controller.ssh
+    end
   end
 end

data/lib/moonshot/controller.rb

@@ -80,6 +80,12 @@ module Moonshot
       success
     end
 
+    def ssh
+      run_plugins(:pre_ssh)
+      stack.ssh
+      run_plugins(:post_ssh)
+    end
+
     def stack
       @stack ||= Stack.new(stack_name,
                            app_name: @config.app_name,
@@ -88,6 +94,11 @@ module Moonshot
         config.parent_stacks = @config.parent_stacks
         config.show_all_events = @config.show_all_stack_events
         config.parameter_strategy = @config.parameter_strategy
+        config.ssh_user = @config.ssh_user
+        config.ssh_identity_file = @config.ssh_identity_file
+        config.ssh_instance = @config.ssh_instance
+        config.ssh_command = @config.ssh_command
+        config.ssh_auto_scaling_group_name = @config.ssh_auto_scaling_group_name
       end
     end
 

data/lib/moonshot/controller_config.rb

@@ -15,6 +15,11 @@ module Moonshot
     attr_accessor :plugins
     attr_accessor :show_all_stack_events
     attr_accessor :parameter_strategy
+    attr_accessor :ssh_instance
+    attr_accessor :ssh_identity_file
+    attr_accessor :ssh_user
+    attr_accessor :ssh_command
+    attr_accessor :ssh_auto_scaling_group_name
 
     def initialize
       @auto_prefix_stack = true

data/lib/moonshot/stack.rb

@@ -93,6 +93,18 @@ module Moonshot
       end
     end
 
+    def ssh
+      box_id = @config.ssh_instance || instances.sort.first
+      box_ip = instance_ip(box_id)
+      cmd = ['ssh', '-t']
+      cmd << "-i #{@config.ssh_identity_file}" if @config.ssh_identity_file
+      cmd << "-l #{@config.ssh_user}" if @config.ssh_user
+      cmd << box_ip
+      cmd << @config.ssh_command if @config.ssh_command
+      puts "Opening SSH connection to #{box_id} (#{box_ip})..."
+      exec(cmd.join(' '))
+    end
+
     def parameters
       get_stack(@name)
         .parameters
@@ -176,6 +188,37 @@ module Moonshot
 
     private
 
+    def asgs
+      resources_of_type('AWS::AutoScaling::AutoScalingGroup')
+    end
+
+    def instance_ip(instance_id)
+      Aws::EC2::Client.new.describe_instances(instance_ids: [instance_id])
+                      .reservations.first.instances.first.public_ip_address
+    rescue
+      raise "Failed to determine public IP address for instance #{instance_id}."
+    end
+
+    def instances # rubocop:disable Metrics/AbcSize
+      groups = asgs
+      asg = if groups.count == 1
+              groups.first
+            elsif asgs.count > 1
+              unless @config.ssh_auto_scaling_group_name
+                raise 'Multiple Auto Scaling Groups found in the stack. Please specify which '\
+                      'one to SSH into using the --auto-scaling-group (-g) option.'
+              end
+              groups.detect { |x| x.logical_resource_id == @config.ssh_auto_scaling_group_name }
+            end
+      raise 'Failed to find the Auto Scaling Group.' unless asg
+
+      Aws::AutoScaling::Client.new.describe_auto_scaling_groups(
+        auto_scaling_group_names: [asg.physical_resource_id]
+      ).auto_scaling_groups.first.instances.map(&:instance_id)
+    rescue
+      raise 'Failed to find instances in the Auto Scaling Group.'
+    end
+
     def stack_name
       "CloudFormation Stack #{@name.blue}"
     end

data/lib/moonshot/stack_config.rb

@@ -4,6 +4,11 @@ module Moonshot
     attr_accessor :parent_stacks
     attr_accessor :show_all_events
     attr_accessor :parameter_strategy
+    attr_accessor :ssh_instance
+    attr_accessor :ssh_identity_file
+    attr_accessor :ssh_user
+    attr_accessor :ssh_command
+    attr_accessor :ssh_auto_scaling_group_name
 
     def initialize
       @parent_stacks = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk