Make ServerConfig mutable

lib/taketo/config_visitors/compiler_visitor.rb

@@ -21,7 +21,7 @@ def initialize
       end
 
       visit Server do |s|
-        s.config = @server_configs_stack.inject(ServerConfig.new, &:merge).merge(s.config)
+        s.config = @server_configs_stack.inject(ServerConfig.new, &:merge!).merge!(s.config)
         s.path = make_node_path(s)
       end
 

lib/taketo/constructs/config.rb

@@ -11,7 +11,7 @@ class Config < BaseConstruct
       def initialize(*args)
         super(nil)
         @shared_server_configs = {}
-        @default_server_config = @default_server_config.merge(
+        @default_server_config.merge!(
           :ssh_command => :ssh,
           :default_command => "bash"
         )

lib/taketo/constructs/environment.rb

@@ -14,7 +14,7 @@ def default_server_config=(server_config)
       end
 
       def add_rails_env(server_config)
-        ServerConfig.new(:environment_variables => { :RAILS_ENV => name.to_s }).merge(server_config)
+        ServerConfig.new(:environment_variables => { :RAILS_ENV => name.to_s }).merge!(server_config)
       end
       private :add_rails_env
     end

lib/taketo/server_config.rb

@@ -2,7 +2,6 @@
 
 module Taketo
 
-  # TODO make it immutable maybe?
   class ServerConfig
     FIELDS = [:ssh_command, :host, :port, :username, :default_location, :default_command, :identity_file, :global_alias].freeze
     attr_accessor *FIELDS
@@ -23,22 +22,13 @@ def global_alias=(value)
       @global_alias = value.to_s
     end
 
-    def merge(server_config)
-      dup.merge!(server_config)
-    end
-
     def merge!(server_config)
       config_hash = Hash[server_config.to_a]
       FIELDS.each { |f| send("#{f}=", config_hash[f]) if config_hash.key?(f) }
       add_environment_variables(config_hash[:environment_variables])
       Array(config_hash[:commands]).each { |c| add_command(c) }
       self
     end
-    protected :merge!
-
-    def dup
-      Marshal.load(Marshal.dump(self))
-    end
 
     def to_a
       values = FIELDS.map { |f| send(f) }
@@ -56,9 +46,6 @@ def add_environment_variables(env_variables)
     def include_shared_server_config(server_config)
       merge!(server_config)
     end
-
-    # overriding command?
-
   end
 
 end

spec/lib/taketo/server_config_spec.rb

@@ -17,38 +17,32 @@ module Taketo
       described_class.new
     end
 
-    describe "#merge" do
+    describe "#merge!" do
       context "with other ServerConfig" do
         it "merges fields" do
-          merged = server_config.merge(described_class.new(:host => "3.4.5.6"))
+          merged = server_config.merge!(described_class.new(:host => "3.4.5.6"))
           expect(merged.host).to eq("3.4.5.6")
           expect(merged.port).to eq(1234) # didn't change
         end
 
         it "deeply merges environment_variables" do
-          merged = server_config.merge(described_class.new(:environment_variables => { :BAR => "bar" }))
+          merged = server_config.merge!(described_class.new(:environment_variables => { :BAR => "bar" }))
           expect(merged.environment_variables).to eq(:SOME_API_SECRET => "sshhh. secret!", :BAR => "bar")
         end
       end
 
       context "with Hash" do
         it "merges fields" do
-          merged = server_config.merge(:host => "3.4.5.6")
+          merged = server_config.merge!(:host => "3.4.5.6")
           expect(merged.host).to eq("3.4.5.6")
           expect(merged.port).to eq(1234) # didn't change
         end
 
         it "deeply merges environment_variables" do
-          merged = server_config.merge(:environment_variables => { :BAR => "bar" })
+          merged = server_config.merge!(:environment_variables => { :BAR => "bar" })
           expect(merged.environment_variables).to eq(:SOME_API_SECRET => "sshhh. secret!", :BAR => "bar")
         end
       end
-
-      it "does not alter source server config" do
-        merged = server_config.merge(:host => "2.3.4.5")
-        expect(merged.host).to eq("2.3.4.5")
-        expect(server_config.host).to eq("1.2.3.4")
-      end
     end
 
     specify "#global_alias= converts to string" do
@@ -58,7 +52,7 @@ module Taketo
 
     describe "#ssh_command" do
       it "returns symbol" do
-        merged = server_config.merge(:ssh_command => "mosh")
+        merged = server_config.merge!(:ssh_command => "mosh")
         expect(merged.ssh_command).to eq(:mosh)
       end
 
@@ -67,12 +61,6 @@ module Taketo
       end
     end
 
-    describe "#dup" do
-      it "duplicates fields" do
-        expect(server_config.dup.environment_variables).not_to equal(server_config.environment_variables)
-      end
-    end
-
     describe "#add_command" do
       it "does not add duplicate commands" do
         server_command1 = ServerCommand.explicit_command("say_hi_1")

spec/support/helpers/construct_spec_helper.rb

@@ -52,7 +52,7 @@ def server(name, options = {})
     options = options.dup
     s = Server.new(name)
     s.path = options.delete(:path) || s.path
-    s.config = s.config.merge(options)
+    s.config.merge!(options)
     yield s if block_given?
     s
   end