buildserver 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592cf2999261101fd4930d23fa025dc72f2fa4d4
-  data.tar.gz: 68b4f932eded37a44ecc262fdf318655497cf4ed
+  metadata.gz: c2a43755fd7148982054971df7e27ab37e595cb9
+  data.tar.gz: 21ba8f7faf430be94ccc706219198bb876b3cbec
 SHA512:
-  metadata.gz: f61f1425f9ce5c5313d45121d7557fc31d4b1cfeb142f21f674b0ea5d9de75bac4dbb670cedf7f4c13f64b3a86d0ba36c7cd287a38e96cbffe2804b474ac7439
-  data.tar.gz: 0e4851330e8babe899614570f07c1516f664304bea8dc4e0643d3e9434260d1c6de1d4dd738baa6f8fe1add58d684a634bff7f6007e6054e1147767562c5a546
+  metadata.gz: 35d6339b9c61886b4ae9304e12ad5d5ff07b5bf9c600fb09e12bcf7a5c2fc9c65733ef2b231142e5a5c0aab203714398bf0867401b812613835ad4d9af6e6ef3
+  data.tar.gz: 496da0df8604580b2defa089848c7849f566c3d1c282734f87eed2f4dc259a94c9e7f64206cb3ce16ec33fa02fba432df7168dab9fb81daad1d5d18bd2487f94

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.2.2

data/README.md

@@ -28,9 +28,9 @@ require 'buildserver'
 require_relative 'blocks/base/builder'
 
 buildserver = Buildserver::Buildserver.new
-buildserver.add_instance('wilmut.example.com', '80.0.0.10', :jumphost)
+buildserver.add_role('jumpserver')
 
-buildserver.add_build_block(:base, Blocks::Base::Builder.new)
+buildserver.add_build_block('base', Blocks::Base::Builder.new)
 
 buildserver.build!
 EOF
@@ -50,11 +50,6 @@ module Blocks
         run_command("apt-get -y install aptitude")
         run_command("aptitude -y full-upgrade")
 
-        # Set hostname
-        run_command("echo \"#{instance.hostname}\" > /etc/hostname")
-        run_command("echo -e \"\\n127.0.0.1 #{instance.hostname} #{instance.hostname}.local\\n\" >> /etc/hosts")
-        run_command("hostname -F /etc/hostname")
-
         # Set ssh to only allow keys
         run_command("sed -i \"/#PasswordAuthentication yes/PasswordAuthentication no/g\" /etc/ssh/sshd_config")
         run_command("service ssh restart", :after)
@@ -71,12 +66,12 @@ end
 EOF
 ```
 
-### Adding servers with roles:
+### Adding roles:
 
 ```ruby
-buildserver.add_instance('m1.example.com', '80.0.0.1', :loadbalancer)
-buildserver.add_instance('m2.example.com', '80.0.0.2', :utility)
-buildserver.add_instance('m3.example.com', '80.0.0.3', :application)
+buildserver.add_role('loadbalancer')
+buildserver.add_role('utility')
+buildserver.add_role('application')
 ```
 
 ### Built-in Builder methods:

data/buildserver.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "buildserver"
-  spec.version       = '1.0.0'
+  spec.version       = '2.0.0'
   spec.authors       = ["Kasper Grubbe"]
   spec.email         = ["kawsper@gmail.com"]
   spec.summary       = %q{Lets you easily compile bash scripts from Ruby to build server instances on your favorite Linux distro.}

data/lib/buildserver.rb

@@ -1,31 +1,31 @@
 require 'fileutils'
 
-require_relative 'buildserver/instance'
+require_relative 'buildserver/role'
 require_relative 'buildserver/building_block'
 require_relative 'buildserver/erb_template'
 
 module Buildserver
 
   class Buildserver
-    def initialize(config = {})
-      @instances = []
-
-      @config = config
+    def initialize
+      @roles = []
     end
 
-    def add_instance(hostname, role, ip_address)
-      @instances << Instance.new(hostname, role, ip_address)
+    def add_role(role)
+      @roles << Role.new(role)
     end
 
     def add_build_block(for_role, build_block)
-      if for_role == :base
-        instances = @instances
+      raise ArgumentError.new("Unknown role: #{for_role}") unless (['base'] + @roles.map(&:role)).include?(for_role)
+
+      if for_role == 'base'
+        roles = @roles
       else
-        instances = @instances.select{|instance| instance.has_role?(for_role.to_s)}
+        roles = @roles.select{|role| role.has_role?(for_role)}
       end
 
-      instances.each do |instance|
-        instance.add_build_block(build_block)
+      roles.each do |role|
+        role.add_build_block(build_block)
       end
     end
 
@@ -33,11 +33,11 @@ module Buildserver
       FileUtils.mkdir_p("builds")
       FileUtils.rm( Dir.glob("builds/*") )
 
-      @instances.each do |instance|
-        puts "Writing to builds/#{instance.hostname}.sh..."
-        commands = instance.build(@config, @instances - [instance])
+      @roles.each do |role|
+        puts "Writing to builds/#{role.role}.sh..."
+        commands = role.build(@roles - [role])
 
-        file = File.new("builds/#{instance.hostname}.sh", "w")
+        file = File.new("builds/#{role.role}.sh", "w")
         commands.each do |command|
           file.puts(command)
         end

data/lib/buildserver/building_block.rb

@@ -3,19 +3,13 @@ require 'erb'
 module Buildserver
   class BuildingBlock
 
-    def build!(config, instance, other_instances)
+    def build!(instance, other_instances)
       reset!
-      @config = config
-
       build(instance, other_instances)
 
       [@build_commands, @after_build_commands]
     end
 
-    def exposes_services
-      []
-    end
-
     def external_ports
       []
     end
@@ -27,7 +21,6 @@ module Buildserver
    private
 
     def reset!
-      @config               = []
       @build_commands       = []
       @after_build_commands = []
     end
@@ -41,13 +34,6 @@ module Buildserver
       end
     end
 
-    ## CONFIG
-    ###############################################
-
-    def config(option)
-      @config[option]
-    end
-
     ## TEMPLATING
     ###############################################
 
@@ -142,7 +128,7 @@ EOF")
     ## TEXT EDITING
     ###############################################
 
-    def find_and_replace(before, after, filepath)
+    def find_and_replace(filepath, before, after)
       run_command("OLD=\"#{before}\"")
       run_command("NEW=\"#{after}\"")
       run_command("sed -i \"s/\${OLD}/\${NEW}/g\" #{filepath}")

data/lib/buildserver/{instance.rb → role.rb}

@@ -2,13 +2,11 @@ require 'json'
 
 module Buildserver
 
-  class Instance
-    attr_reader :hostname, :ip_address, :role
+  class Role
+    attr_reader :role
 
-    def initialize(hostname, role, ip_address)
-      @hostname     = hostname
+    def initialize(role)
       @role         = role.to_s
-      @ip_address   = ip_address
       @build_blocks = []
     end
 
@@ -16,14 +14,6 @@ module Buildserver
       @build_blocks << block
     end
 
-    def to_s
-      "#{@hostname}/#{@ip_address} - #{@role}"
-    end
-
-    def services
-      @build_blocks.map{|bb| bb.exposes_services}.flatten
-    end
-
     def external_ports
       @build_blocks.map{|bb| bb.external_ports}.flatten
     end
@@ -36,7 +26,7 @@ module Buildserver
       @role == role.to_s
     end
 
-    def build(config, instances)
+    def build(roles)
       @commands       = []
       @after_commands = []
 
@@ -47,7 +37,7 @@ module Buildserver
       @build_blocks.each do |build_block|
         @commands << "# ! #{build_block.to_s} -------------------------------------"
 
-        commands, after_commands = build_block.build!(config, self, instances)
+        commands, after_commands = build_block.build!(self, roles)
 
         @commands << commands
         @commands << "# / #{build_block.to_s} -------------------------------------"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildserver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Kasper Grubbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,7 @@ files:
 - lib/buildserver.rb
 - lib/buildserver/building_block.rb
 - lib/buildserver/erb_template.rb
-- lib/buildserver/instance.rb
+- lib/buildserver/role.rb
 homepage: https://github.com/Pidrock/buildserver
 licenses:
 - MIT
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Lets you easily compile bash scripts from Ruby to build server instances