shiprails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41f419db3aec35abe63a8626d686127b848d811
-  data.tar.gz: 8a846097d99b22a449d23554db3e5434592634ad
+  metadata.gz: 9f6d4d236056ae63cc0c45a01ffc84f1eb579046
+  data.tar.gz: 142517c6bdcec225dae78167de982fd257979ec3
 SHA512:
-  metadata.gz: 0ea5aa16a9840fc0bcd813a078f94a30c372d512bda15d99be5490a7d5aa144b83d1ef6d9b5d1c3f3697b488c115cc65e609f86cf00868d139c338c4917c0310
-  data.tar.gz: 08272990a67c8fa99cab6258ae71a296b9893386e1dd215423e065d8c26d12ff96bb5fbaae95e99a228193cd3e741860c14b1adf9c88ea75b734c1a76fce2def
+  metadata.gz: d63e1ae14db4b0e055082b48da424f1c365f77acc20acf72f1b82dbc4587534fec163c2fab5918905722c9585b5db46c214d9be6c2d0bd9f06bf24c66e3cd6c4
+  data.tar.gz: 78e7470fb2b5f4c98e41affeda518ad11438aa521f2788832b259335fb1d340defd52ccdf28b14ec427fc948179265f8d2331699a4f99a08029006200b2f3c6f

data/lib/shiprails/port.rb

@@ -16,37 +16,45 @@ module Shiprails
       say "TODO: store development config vars"
     end
 
+    desc "exec", "Run interactive commands"
+    method_option "no-rm",
+      default: false,
+      desc: "Remove container changes after use",
+      type: :boolean
+    def exec(*command_args)
+      build_command_args = ["docker-compose", "run"]
+      build_command_args << "--rm" unless options['no-rm']
+      build_command_args << "app"
+      build_command_args += command_args
+      command_string = build_command_args.join(' ')
+      run command_string
+    end
+
     desc "up", "Hoist app and services"
     def up
       run "docker-compose up"
     end
 
-    desc "bundle", "Run bundler commands"
-    def bundle(*command)
-      command_string = command.join(' ')
-      if command_string.start_with?("exec")
-        run "docker-compose run --rm app bundle #{command_string}"
-      else
-        run "docker-compose run app bundle #{command_string}"
-      end
-    end
-
-    desc "rails", "Run rails commands"
-    def rails(*command)
-      command_string = command.join(' ')
-      run "docker-compose run --rm app bundle exec rails #{command_string}"
+    def self.configuration
+      YAML.load(File.read(".shiprails.yml")).deep_symbolize_keys rescue {}
     end
 
-    desc "bash", "Run bash commands"
-    def bash(*command)
-      command_string = command.join(' ')
-      run "docker-compose run --rm app bash #{command_string}"
-    end
-
-    private
-
-    def configuration
-      YAML.load(File.read(".shiprails.yml")).deep_symbolize_keys
+    if commands = configuration[:exec]
+      commands.each do |name, command|
+        desc name, "port exec #{command}"
+        method_option "no-rm",
+          default: false,
+          desc: "Remove container changes after use",
+          type: :boolean
+        define_method name.to_sym do |*command_args|
+          build_command_args = ["docker-compose", "run"]
+          build_command_args << "--rm" unless options['no-rm']
+          build_command_args << "app"
+          build_command_args += command.split(' ') + command_args
+          command_string = build_command_args.join(' ')
+          run command_string
+        end
+      end
     end
 
   end

data/lib/shiprails/ship/exec.rb

@@ -32,6 +32,16 @@ module Shiprails
         ecs_exec(region, cluster_name, service, command_string, ssh_private_key_path)
       end
 
+      no_commands do
+        def run_shorthand_command(command_args=nil, opts=nil)
+          options = opts unless opts.nil?
+          cluster_name = "#{project_name}_#{environment}"
+          command_string = command_args.join ' '
+          ssh_private_key_path = private_key
+          ecs_exec(region, cluster_name, service, command_string, ssh_private_key_path)
+        end
+      end
+
       private
 
       def configuration

data/lib/shiprails/ship/install/shiprails.yml.erb

@@ -1,4 +1,8 @@
 config_s3_bucket: '<%= config_s3_bucket %>'
+exec:
+  bash: "bash"
+  bundle: "bundle exec"
+  rails: "bundle exec rails"
 private_key_path: '<%= ec2_ssh_private_key_path %>'
 project_name: '<%= project_name %>'
 services:

data/lib/shiprails/ship.rb

@@ -51,11 +51,40 @@ module Shiprails
       Scale.start
     end
 
-    private
-
-    def configuration
-      YAML.load(File.read(".shiprails.yml")).deep_symbolize_keys
+    def self.configuration
+      YAML.load(File.read(".shiprails.yml")).deep_symbolize_keys rescue {}
     end
 
+    if commands = configuration[:exec]
+      commands.each do |name, command|
+        desc name, "ship exec #{command}"
+        method_option "path",
+          aliases: ["-p"],
+          default: ".",
+          desc: "Specify a configuration path"
+        method_option "environment",
+          aliases: ["-e"],
+          desc: "Specify the environment"
+        method_option "region",
+          aliases: ["-r"],
+          default: "us-west-2",
+          desc: "Specify the region"
+        method_option "service",
+          aliases: ["-a"],
+          default: "app",
+          desc: "Specify the service name"
+        method_option "private-key",
+          aliases: ["-pk"],
+          desc: "Specify the AWS SSH private key path"
+        define_method name.to_sym do |*command_args|
+          require "shiprails/ship/exec"
+          built_arguments = command.split(' ') + command_args
+          built_options = options.map{|k,v| "--#{k} #{v}"}
+          script = Exec.new built_arguments, built_options
+          script.run_shorthand_command built_arguments, options
+        end
+      end
+    end
+    
   end
 end

data/lib/shiprails/version.rb

@@ -1,3 +1,3 @@
 module Shiprails
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiprails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Zane Shannon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Shiprails helps you deploy Rails to AWS ECS.