phase 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0348a387cd72008efb9ac4e146666f193ac0007b
-  data.tar.gz: 3b871ecfcc7d89b48dcc90ff78cd114b3e749240
+  metadata.gz: e4d5af31cbe28ce6b554391603524b7b2e1f09c6
+  data.tar.gz: 0cb46939ed6cd9190d37e8c3ce8ca7687ff7e3dd
 SHA512:
-  metadata.gz: 7912b55eb7b03d26e9fae06c27f2dd46eb7f693dfdd5e4a89207ec03880e27abfb3221eaa35a451b26f06341be771d1a69a26ce49adba59c84466eef064970f1
-  data.tar.gz: df587124963dc679162d2e825a5a92ed1a4b7c1b0049dde356dba42b481d252df0adce6fa3486760d2de899c51cebe4d419c07d0a1d51ab4d4c87d6b03dd1ecf
+  metadata.gz: e8d0c8cfff6a464bd2393ada3cb073bd885d5114098a47444d7f4a73308f2d3328624af311af8cff3c7a01f30647f5bd66760f125d627f08622d0326d00cf186
+  data.tar.gz: 6fff147f369b8c82aea3c31b0bac1948eb6d62cdb144288953f2752c010a679d93ff40636ab5ae7be654852c46d852c89acc46be311359e332e60d68c7048f78

data/lib/phase/cli/all.rb

@@ -1,5 +1,6 @@
 require "phase/cli/command"
 
+require "phase/cli/build"
 require "phase/cli/env"
 require "phase/cli/deploy"
 require "phase/cli/keys"

data/lib/phase/cli/build.rb

@@ -0,0 +1,35 @@
+module Phase
+  module CLI
+    class Build < Command
+
+      command :build do |c|
+        c.syntax = "phase build <version_number>"
+
+        c.description = <<-EOS.strip_heredoc
+          Builds a new Docker image of the latest committed code on the current branch. Tags the
+          build with <version_number>.
+        EOS
+
+        c.action do |args, options|
+          new(args, options).run
+        end
+      end
+
+      attr_reader :version_number
+
+      def initialize(args, options)
+        super
+
+        @version_number = args[0]
+
+        fail "must specify version number" unless version_number
+      end
+
+      def run
+        build = ::Phase::Deploy::Build.new(version_number)
+        build.execute!
+      end
+
+    end
+  end
+end

data/lib/phase/cli/deploy.rb

@@ -3,12 +3,10 @@ module Phase
     class Deploy < Command
 
       command :deploy do |c|
-        c.syntax = "phase deploy [-e environment_name] version_number"
-
-        c.option "-e", "--env environment_name", String, "Deploy to this environment."
+        c.syntax = "phase deploy <environment_name> <version_number>"
 
         c.description = <<-EOS.strip_heredoc
-          Builds and deploys code to the specified 'environment_name'. 'environment_name' may be
+          Builds and deploys code to the specified <environment_name>, which may be
           any environment configured in the Phasefile.
         EOS
 
@@ -17,33 +15,25 @@ module Phase
         end
       end
 
-      attr_reader :version_number
+      attr_reader :env_name, :version_number
 
       def initialize(args, options)
         super
 
-        @version_number = args.first
+        fail "must specify both environment and version number" unless args.count >= 2
+
+        @env_name       = args[0]
+        @version_number = args[1]
 
-        fail "must specify environment with '-e'" unless options.env
+        fail "must specify environment"    unless env_name
         fail "must specify version number" unless version_number
       end
 
       def run
-        opts = {
-          version_tag: version_number
-        }
-
-        deployment = case options.env
-        when "sandbox"
-          ::Phase::Deploy::SandboxDeployment.new(opts)
-        when "staging"
-          ::Phase::Deploy::StagingDeployment.new(opts)
-        when "production"
-          ::Phase::Deploy::ProductionDeployment.new(opts)
-        else
-          fail "unknown environment: '#{environment}'"
-        end
+        environment = config.deploy.environments.find { |e| e.name == env_name }
+        fail "unknown environment: '#{env_name}'" unless environment
 
+        deployment = Deploy::Deployment.new(environment, version_tag: version_number)
         deployment.execute!
       end
 

data/lib/phase/config/deploy.rb

@@ -0,0 +1,42 @@
+module Phase
+  module Config
+    class Deploy
+
+      # @return [Array<Environment>] the configured deployment environments
+      attr_reader :environments
+
+
+      # @return [String] the compact or fully-qualified address of the Docker repository
+      # @example Sample settings
+      #   config.deploy.docker_repository = "mycompany/myrepo"
+      #   config.deploy.docker_repository = "https://docker.mycompany.com/myrepo"
+      attr_accessor :docker_repository
+
+
+      def initialize
+        @environments = []
+      end
+
+      # Adds a new deployment environment.
+      # @return [Environment] the new environment
+      def environment(name, options = {})
+        @environments << Environment.new(name, options)
+      end
+    end
+
+
+    class Environment
+
+      attr_accessor :name, :perform_build, :server_filters
+
+      alias_method :perform_build?, :perform_build
+
+      def initialize(name, options = {})
+        @name = name
+        @perform_build = options.fetch(:build, true)
+        @server_filters = options.fetch(:servers, {})
+      end
+
+    end
+  end
+end

data/lib/phase/config/ipa.rb

@@ -0,0 +1,42 @@
+module Phase
+  module Config
+    class IPA
+
+      # @return [String] the bundle ID prefix
+      # @example Sample setting
+      #   config.ipa.bundle_id_prefix = "com.mycompany"
+      attr_accessor :bundle_id_prefix
+
+
+      # @return [String] the directory keypath (e.g. 'prefix' at S3) for storing uploaded files
+      # @example Sample setting
+      #   config.ipa.directory_prefix = "somedir/nesteddir"
+      attr_accessor :directory_prefix
+
+
+      # @return [String] the bucket for storing uploaded files
+      # @example Sample setting
+      #   config.ipa.bucket_name = "mycompany-enterprise-builds"
+      attr_accessor :bucket_name
+
+
+      # @return [String] the company name to provide with enterprise app installs
+      # @example Sample setting
+      #   config.ipa.company_name = "ACME Corp"
+      attr_accessor :company_name
+
+
+      # @return [String] the URL of a full-size (512px x 512px) app icon PNG
+      # @example Sample setting
+      #   config.ipa.full_image_url = "https://....png"
+      attr_accessor :full_image_url
+
+
+      # @return [String] the URL of a Springboard-size (72px x 72px) app icon PNG
+      # @example Sample setting
+      #   config.ipa.icon_image_url = "https://....png"
+      attr_accessor :icon_image_url
+
+    end
+  end
+end

data/lib/phase/configuration.rb

@@ -22,21 +22,14 @@ module Phase
       ::SSHKit.config.backend = @backend
     end
 
-    # Available options:
-    #   * docker_repository [String]
+    # @see Phase::Config::Deploy
     def deploy
-      @deploy ||= ::ActiveSupport::OrderedOptions.new
+      @deploy ||= Config::Deploy.new
     end
 
-    # Available options:
-    #   * bundle_id_prefix [String]
-    #   * directory_prefix [String]
-    #   * bucket_name      [String]
-    #   * company_name     [String]
-    #   * full_image_url   [String]
-    #   * icon_image_url   [String]
+    # @see Phase::Config::IPA
     def ipa
-      @ipa ||= ::ActiveSupport::OrderedOptions.new
+      @ipa ||= Config::IPA.new
     end
 
     def load_phasefile!
@@ -45,10 +38,10 @@ module Phase
       end
     end
 
-    def set_aws_credentials!
+    def set_aws_credentials!(access_key_id = nil, secret_access_key = nil)
       Fog.credentials = {
-        aws_access_key_id:     ENV.fetch('AWS_ACCESS_KEY_ID'),
-        aws_secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY')
+        aws_access_key_id:     ENV.fetch('AWS_ACCESS_KEY_ID', access_key_id),
+        aws_secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', secret_access_key)
       }
     end
 

data/lib/phase/kit/deploy/build.rb

@@ -20,24 +20,26 @@ module Phase
       private
 
         def build_image
-          remove_stale_build_dir
-          clone_local_repo
+          prepare_build
 
           shell("docker build -t #{repo_name}:#{version_tag} #{build_dir}") do |status|
             fail "couldn't build Docker image"
           end
         end
 
-        def remove_stale_build_dir
-          ::FileUtils.rm_r(build_dir)
-        end
-
-        def clone_local_repo
-          shell("git clone --depth 1 -- file://$(pwd) #{build_dir}") do |status|
+        def clone_local_git_repo
+          current_branch = `git rev-parse --abbrev-ref HEAD`.strip
+          shell("git clone --reference $(pwd) --branch #{current_branch} --depth 1 -- file://$(pwd) #{build_dir}") do |status|
             fail "couldn't clone local copy of git repository"
           end
         end
 
+        def prepare_build
+          remove_stale_build_dir!
+          clone_local_git_repo
+          set_file_modification_timestamps
+        end
+
         # def tag_image
         #   shell("docker tag #{repo_name}:#{version_tag} #{repo_name}:latest") do |status|
         #     fail "couldn't tag Docker image"
@@ -49,35 +51,21 @@ module Phase
             fail "couldn't push #{repo_name}:#{version_tag}"
           end
 
-          shell("docker push #{repo_name}:latest") do |status|
-            fail "couldn't push #{repo_name}:latest"
-          end
+          # shell("docker push #{repo_name}:latest") do |status|
+          #   fail "couldn't push #{repo_name}:latest"
+          # end
         end
 
-        def repo_name
-          ::Phase.config.deploy.docker_repository
+        def remove_stale_build_dir!
+          ::FileUtils.rm_rf(build_dir)
         end
-    end
-
-
-    class SandboxBuild < Build
-      def execute
-        build_image
-        push
-      end
-
-      private
 
-        def build_image
-          shell("docker build -t #{repo_name}:#{version_tag} .") do |status|
-            fail "couldn't build Docker image"
-          end
+        def repo_name
+          ::Phase.config.deploy.docker_repository
         end
 
-        def push
-          shell("docker push #{repo_name}:#{version_tag}") do |status|
-            fail "couldn't push #{repo_name}:#{version_tag}"
-          end
+        def set_file_modification_timestamps
+          
         end
     end
 

data/lib/phase/kit/deploy/deployment.rb

@@ -2,42 +2,27 @@ module Phase
   module Deploy
 
     class Deployment
-      attr_reader :options, :build
+      attr_reader :options#, :build
 
       def initialize(options = {})
         @options = options
       end
 
-      def build
-        @build ||= Build.new(options[:version_tag])
-      end
+      # def build
+      #   @build ||= Build.new(options[:version_tag])
+      # end
 
       def execute!
-        build.execute!
+        # build.execute!
         deploy_image
       end
 
       private
 
         def deploy_image
-          system("")
+          system("echo yaaaay")
         end
     end
 
-
-    class SandboxDeployment < Deployment
-      def build
-        @build ||= SandboxBuild.new(options[:version_tag])
-      end
-    end
-
-
-    class StagingDeployment < Deployment
-    end
-
-
-    class ProductionDeployment < Deployment
-    end
-
   end
 end

data/lib/phase/util/console.rb

@@ -7,6 +7,7 @@ module Phase
       end
 
       def fail(str)
+        puts
         abort "[phase]".red + " #{ str }"
       end
 

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "0.0.15"
+	VERSION = "0.0.16"
 end

data/lib/phase.rb

@@ -29,6 +29,9 @@ require 'phase/kit/ssh/command'
 require 'phase/kit/ssh/runners'
 
 require 'phase/configuration'
+require 'phase/config/deploy'
+require 'phase/config/ipa'
+
 require 'phase/version'
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -209,6 +209,7 @@ files:
 - lib/phase/adapters/aws/subnet.rb
 - lib/phase/cli.rb
 - lib/phase/cli/all.rb
+- lib/phase/cli/build.rb
 - lib/phase/cli/command.rb
 - lib/phase/cli/deploy.rb
 - lib/phase/cli/env.rb
@@ -218,6 +219,8 @@ files:
 - lib/phase/cli/mosh.rb
 - lib/phase/cli/ssh.rb
 - lib/phase/cli/status.rb
+- lib/phase/config/deploy.rb
+- lib/phase/config/ipa.rb
 - lib/phase/configuration.rb
 - lib/phase/dsl.rb
 - lib/phase/kit/deploy/build.rb
@@ -265,3 +268,4 @@ summary: A simple way to manage cloud instances within a multi-subnet network, l
 test_files:
 - spec/dsl_spec.rb
 - spec/spec_helper.rb
+has_rdoc: