phase 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb7ef15efc3d89bc0e365884c2aade6a215cf70
-  data.tar.gz: a352b3bfd0a672d6ce01062263b758251df76023
+  metadata.gz: ff87524fd331aa1846e689747bc4775a3df69f7d
+  data.tar.gz: ac049168017802c12ae6ed6b62c202b6c683704f
 SHA512:
-  metadata.gz: 08044e4ea70d6421c0005306de605bdcd7c03b10d6e3b2723db3a5cd1db463094f11a6b785850d170495279b1aa43c5d6832563d00c725f4bf34f66a8b12cd77
-  data.tar.gz: 217a1d8005beb9e7aeedfd00be6e51b022f3c483534826f8dcb5957056038e5d7f7ae527513d085379ab66bdef9045e8b815199edd9b0e77133c62c7f0a22b35
+  metadata.gz: 2358fef15cabba6491fae0977b28790efa8b4e1a16d308c8483951d046ec78a4d038da7291fde10c061acf96e1cfec3047f8f76e396b88e5928135afaf26ed8e
+  data.tar.gz: 12d985acdbd1f5624517270a12314d55c9a3335bc8945965b3b52a6fdfd40c36f89fdc9062b1ede3951cc94807625251496a24d2db0b3616d6464a585474e353

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/phase/cli/deploy.rb

@@ -23,12 +23,13 @@ module Phase
       end
 
       def run
-        # load_environment_config
-        # create_build_dir
-        # shallow_clone_repository
-        # build_docker_image
-        # push_docker_image
-        # trigger_remote_deployment
+        if environment == "sandbox"
+          deployment = ::Phase::Deploy::SandboxDeployment.new
+        else
+          deployment = ::Phase::Deploy::Deployment.new(environment)
+        end
+
+        deployment.execute!
       end
 
     end

data/lib/phase/configuration.rb

@@ -23,12 +23,18 @@ module Phase
     end
 
     # Available options:
-    #   * bundle_id_prefix
-    #   * directory_prefix
-    #   * bucket_name
-    #   * company_name
-    #   * full_image_url
-    #   * icon_image_url
+    #   * docker_repository [String]
+    def deploy
+      @deploy ||= ::ActiveSupport::OrderedOptions.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]
     def ipa
       @ipa ||= ::ActiveSupport::OrderedOptions.new
     end

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

@@ -2,15 +2,16 @@ module Phase
   module Deploy
 
     class Build
-      attr_reader :version_tag
+      attr_reader :version_tag, :build_dir
 
-      def initialize(version_tag)
+      def initialize(version_tag, options = {})
         @version_tag = version_tag
+        @build_dir = options.fetch(:build_dir, "./build")
       end
 
       def execute
         build_image
-        tag_latest_image
+        tag_image
         push
       end
 
@@ -18,28 +19,48 @@ module Phase
 
         def build_image
           clear_build_dir
-          clone_clean_repo
-          system("docker build -t #{repo_name}:#{version_tag} .build/")
+          clone_local_repo
+          system("docker build -t #{repo_name}:#{version_tag} #{build_dir}")
         end
 
-        def tag_latest_image
+        def clear_build_dir
+          ::FileUtils.mkdir_p(build_dir)
+        end
+
+        def clone_local_repo
+          system("git clone --depth 1 -- file://$(pwd) #{build_dir}")
+        end
+
+        def tag_image
           system("docker tag #{repo_name}:#{version_tag} #{repo_name}:latest")
         end
 
         def push
           system("docker push #{repo_name}:#{version_tag}")
+          system("docker push #{repo_name}:latest")
         end
 
         def repo_name
-          ::Phase.config.docker_repository
+          ::Phase.config.deploy.docker_repository
         end
     end
 
 
     class SandboxBuild < Build
-      def build
-        system(build_image_cmd)
+      def execute
+        build_image
+        push
       end
+
+      private
+
+        def build_image
+          system("docker build -t #{repo_name}:#{version_tag} .")
+        end
+
+        def push
+          system("docker push #{repo_name}:#{version_tag}")
+        end
     end
 
   end

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

@@ -1,26 +1,26 @@
 module Phase
   module Deploy
-    class Deployment
-
-      # environment
-      # build options
-        # tag strategy
-      # server options
-        # environment name
-        # role name
 
-      attr_reader :build
+    class Deployment
+      attr_reader :environment, :build
 
       def initialize(environment, options = {})
-        case environment
-        when :sandbox
-          self.build = SandboxBuild.new
-        else
-          self.build = Build.new
-        end
+        @environment = environment
+        @build = Build.new(options[:version_tag])
+      end
 
+      def execute!
+        @build.execute
+        deploy_image
+      end
+    end
 
+
+    class SandboxDeployment < Deployment
+      def initialize(options = {})
+        @build = SandboxBuild.new(options[:version_tag])
       end
     end
+
   end
 end

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "0.0.11"
+	VERSION = "0.0.12"
 end

data/phase.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'fog',            '~> 1.23'
   spec.add_runtime_dependency 'capistrano',     '~> 3.2'
   spec.add_runtime_dependency 'colorize',       '~> 0.7'
-  spec.add_runtime_dependency 'dotenv',         '~> 0.11'
+  spec.add_runtime_dependency 'dotenv',         '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake',    '~> 10.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement