codily 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5ccea29ad8df53e57d7ea9a3f4f7cf39f2c4ba4
-  data.tar.gz: 6f15de9ea8cf711a27d9025ebbe188b67ee1c8ea
+  metadata.gz: 9101d20d4d6d01e3dca68580eb3604844848c74c
+  data.tar.gz: f0d018dace390dc03f9d4331ff9966c300378d40
 SHA512:
-  metadata.gz: d2e8231b7369ac78b0977a95e0f77617a8cce6b6dd4f2ab075dc7c0c6d2461abe3813a116ba387a49c771c325f394249a803ec68362c8d05789f8f0e08138c63
-  data.tar.gz: a5195b25eddb9b7cab63133be12bf54edc7d883381b008496bdd9e4161677f12920939188c1db5334b229656c3005141a6a17e22bdc6dadbe1aa6f5e7b47eb0d
+  metadata.gz: 7a6c69fea4315b52b6de100fd1990f045197a2737fc5dd282fbf49f70a8ee94bbec784fd732d99884008ec2350b746c5e2684ad77088ba35cfd9be9fcb9e721d
+  data.tar.gz: 36734debdd91241dc72e7e5a9dff19ff9d24ec28b478d4cdee6fcfea5b113bec50b8a5b23bf40797dc728834157423018f217142e612fdcad5bdf52fcdbf0ec5

data/README.md

@@ -27,7 +27,8 @@ Usage: codily [options]
     -t, --target REGEXP              Filter services by name to apply or export.
     -n, --dry-run                    Just displays the oprerations that would be performed, without actually running them.
     -D, --debug                      Debug mode
-    -V, --target-version SVC_VER     Choose version to export (format= service_name:version) This option can be used multiple time.
+    -A, --activate                   Activate after apply
+    -V, --target-version SVC_VER     Choose version to export (format= service_name:version) This option can be used multiple time..
 ```
 
 ```
@@ -39,6 +40,7 @@ codily --export --target my-service --target-version my-service:42
 codily --export --file ./codily.rb
 
 codily --apply --file ./codily.rb
+codily --apply --file ./codily.rb --activate
 codily --apply --file ./codily.rb --dry-run
 codily --apply --file ./codily.rb --target my-service
 ```

data/lib/codily/cli.rb

@@ -44,7 +44,7 @@ module Codily
 
       require_fastly_auth!
 
-      engine = Engine.new(fastly, present, desired, service_filter: options[:target])
+      engine = Engine.new(fastly, present, desired, service_filter: options[:target], activate: options[:activate])
 
       act = engine.run(dry_run: options[:dry_run])
 
@@ -108,9 +108,9 @@ module Codily
           options[:debug] = true
         end
 
-        #opt.on('-A', '--activate', "Activate after apply") do
-        #  options[:activate] = true
-        #end
+        opt.on('-A', '--activate', "Activate after apply") do
+          options[:activate] = true
+        end
 
         #opt.on('-d', '--diff', "Call diff API after apply") do
         #  options[:diff] = true

data/lib/codily/engine.rb

@@ -17,15 +17,16 @@ require 'codily/elements/settings'
 
 module Codily
   class Engine
-    def initialize(fastly, present, desired, service_filter: nil)
+    def initialize(fastly, present, desired, service_filter: nil, activate: false)
       @fastly = fastly
       @present = present
       @desired = desired
 
       @service_filter = service_filter
+      @activate = activate
     end
 
-    attr_reader :fastly, :present, :desired, :service_filter
+    attr_reader :fastly, :present, :desired, :service_filter, :activate
 
     ORDER = [
       Elements::Service,
@@ -49,14 +50,12 @@ module Codily
         puts
       end
 
-      act_any = false
-      act = false
-
-      present.service_versions.each do |id, version|
+      affected_services.each do |key|
+        version = present.service_version_get(key)
         if !version[:dev]
           puts "CLONE VERSION: #{version[:name]}.#{version[:active]}"
           if !dry_run
-            version[:dev] = fastly.get_version(id, version[:active]).clone.number
+            version[:dev] = fastly.get_version(version[:id], version[:active]).clone.number
           end
         end
       end
@@ -64,7 +63,6 @@ module Codily
       puts
 
       creations.each do |new_element|
-        act_any = act = true
         puts "CREATE: #{new_element.inspect}"
 
         hash = new_element.as_hash
@@ -84,11 +82,7 @@ module Codily
         end
       end
 
-      puts if act
-      act = false
-
       updates.each do |present_elem, desired_elem|
-        act_any = act = true
         puts "UPDATE: - #{present_elem.inspect}"
         puts "        + #{desired_elem.inspect}"
 
@@ -104,11 +98,7 @@ module Codily
         end
       end
 
-      puts if act
-      act = false
-
       removals.each do |removed_element|
-        act_any = act = true
         puts "DELETE: #{removed_element.inspect}"
 
         unless dry_run
@@ -116,37 +106,65 @@ module Codily
         end
       end
 
+      act_any = !affected_services.empty?
+
       unless act_any
         puts "No difference."
       end
+
+      puts
+
+      if activate
+        affected_services.each do |id|
+          version = present.service_version_get(id)
+          puts "ACTIVATE VERSION: #{version[:name]}.#{version[:dev]}"
+          if !dry_run
+            fastly.get_version(version[:id], version[:dev]).activate!
+          end
+        end
+      end
+
       act_any
     end
 
     def creations
-      new_keys = desired_element_keys - present_element_keys
-      sort_elements(new_keys.map{ |_| desired.elements[_[0]][_[1]] })
+      @creations ||= begin
+        new_keys = desired_element_keys - present_element_keys
+        sort_elements(new_keys.map{ |_| desired.elements[_[0]][_[1]] })
+      end
     end
 
     def updates
-      common = present_element_keys & desired_element_keys
+      @updates ||= begin
+        common = present_element_keys & desired_element_keys
 
-      present_existing = common.map{ |_| present.elements[_[0]][_[1]] }
-      desired_existing = common.map{ |_| desired.elements[_[0]][_[1]] }
+        present_existing = common.map{ |_| present.elements[_[0]][_[1]] }
+        desired_existing = common.map{ |_| desired.elements[_[0]][_[1]] }
 
-      raise '!?' if present_existing.size != desired_existing.size
+        raise '!?' if present_existing.size != desired_existing.size
 
-      present_existing.zip(desired_existing).map do |present_elem, desired_elem|
-        if present_elem.as_hash != desired_elem.as_hash
-          [present_elem, desired_elem]
-        else
-          nil
-        end
-      end.compact.sort_by { |_| ORDER.index(_[0].class) }
+        present_existing.zip(desired_existing).map do |present_elem, desired_elem|
+          if present_elem.as_hash != desired_elem.as_hash
+            [present_elem, desired_elem]
+          else
+            nil
+          end
+        end.compact.sort_by { |_| ORDER.index(_[0].class) }
+      end
     end
 
     def removals
-      removed_keys = present_element_keys - desired_element_keys
-      sort_elements(removed_keys.map{ |_| present.elements[_[0]][_[1]] })
+      @removals ||= begin
+        removed_keys = present_element_keys - desired_element_keys
+        sort_elements(removed_keys.map{ |_| present.elements[_[0]][_[1]] })
+      end
+    end
+
+    def affected_services
+      [*creations, *removals, *updates.map(&:first)].
+        select { |_| _.parent_class == Elements::Service }.
+        map(&:parent_key).
+        uniq
     end
 
     private

data/lib/codily/version.rb

@@ -1,3 +1,3 @@
 module Codily
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codily
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sorah Fukumori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastly
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Codificate Fastly configuration