dply 0.0.5 → 0.0.7

data/lib/dply/strategy/git.rb

@@ -2,6 +2,7 @@ require 'dply/helper'
 require 'dply/setup'
 require 'dply/linker'
 require 'dply/config_downloader'
+require 'dply/yum'
 require 'forwardable'
 
 
@@ -12,41 +13,36 @@ module Dply
       extend Forwardable
       include Helper
 
-      def_delegators :config, :target, :branch, :link_config,
-                     :config_dir, :config_map, :dir_map, :config_skip_download,
+      attr_reader :config, :options
+      def_delegators :config, :target, :branch,
+                     :config_map, :dir_map, :config_skip_download,
                      :config_download_url
                 
-      
-      attr_reader :config, :options
-
       def initialize(config, options)
         @config = config
-        @options = options
+        @options = options || {}
       end
 
       def deploy
-        setup.run
-        config_downloader.download_all if config_download_url
+        setup.git
+        download_configs if config_download_url
         Dir.chdir current_dir do
           previous_version = git.commit_id
           git_step
           current_version = git.commit_id
           link_dirs
-          link_config_files
-          env = {
-            "DPLY_PREVIOUS_VERSION" => previous_version,
-            "DPLY_CURRENT_VERSION" => current_version
-          }
-          tasks.deploy target, env: env
+          link_config
+          yum_install
+          tasks.deploy target
+#          tasks.report_changes(previous_version, current_version)
         end
       end
 
-      def switch
-      end
-
       def reload
-        config_downloader.download_all if config_download_url
+        download_configs if config_download_url
         Dir.chdir current_dir do
+          link_dirs
+          link_config_files
           tasks.reload target
         end
       end
@@ -54,7 +50,14 @@ module Dply
       private
 
       def current_dir
-        @current_dir ||= "#{config.deploy_dir}/current"
+        @current_dir ||= "#{config.dir}/current"
+      end
+
+      def download_configs
+        files = config_map.values.uniq
+        downloader = ConfigDownloader.new(files, config_download_url)
+        downloader.skip_download = config_skip_download 
+        downloader.download_all
       end
 
       def git_step
@@ -66,38 +69,32 @@ module Dply
         end
       end
 
-      def link_config_files
-        return if not link_config
-        logger.bullet "symlinking config files"
-        config_linker.create_symlinks
+      def link_dirs
+        link "#{config.dir}/shared", dir_map
       end
 
-      def link_dirs
-        return if not dir_map
-        logger.bullet "symlinking shared dirs"
-        dir_linker.create_symlinks
+      def link_config
+        link "#{config.dir}/config", config_map
       end
 
-      def config_linker
-        return @config_linker if @config_linker
-        source = "#{config.deploy_dir}/config"
-        dest = current_dir
-        @config_linker ||= ::Dply::Linker.new(source, dest, map: config_map)
+      def yum_install
+        Yum.new("pkgs.yml").install
       end
 
-      def config_downloader
-        @config_downloader = ::Dply::ConfigDownloader.new(config_map.values.uniq, config_download_url, config_skip_download: config_skip_download)
+      def setup
+        @setup ||= Setup.new(@config)
       end
 
-      def dir_linker
-        return @dir_linker if @dir_linker
-        source = "#{config.deploy_dir}/shared"
-        dest = current_dir
-        @dir_linker ||= ::Dply::Linker.new(source, dest, map: dir_map)
+      def tasks
+        @tasks ||= Tasks.new(deployment: true)
       end
 
-      def setup
-        @setup ||= Setup.load(:git, config)
+      def link(source, map)
+        return if not map
+        logger.bullet "symlinking #{source}"
+        dest = current_dir
+        linker = Linker.new(source, dest, map: map)
+        linker.create_symlinks
       end
 
     end

data/lib/dply/tasks.rb

@@ -1,55 +1,52 @@
 require 'dply/shell'
+require 'dply/bundle'
+require 'json'
 module Dply
   class Tasks
 
     include Shell
 
-    def deploy(target, env:{})
-      env.merge!(env_from_yml)
-      bundle_install
-      cmd "#{rake_command} #{target}:deploy", env: env
+    def initialize(deployment: true)
+      @deployment = deployment
     end
 
-    def switch(target, env:{})
-      env.merge!(env_from_yml)
-      bundle_install
-      cmd "#{rake_command} #{target}:switch", env: env
+    def deploy(target)
+      bundle.install
+      rake "#{target}:deploy"
     end
 
     def reload(target)
-      bundle_install
-      cmd "#{rake_command} #{target}:reload", env: env_from_yml
+      bundle.install
+      rake "#{target}:reload"
     end
 
-    def gemfile_exists?
-      File.exists? "Gemfile"
+    def task(task)
+      bundle.install
+      rake task
     end
 
-    def rake_command
-      if gemfile_exists?
-        "bundle exec rake -R dply"
-      else
-        "rake -R dply"
-      end
+    def build(task)
+      bundle.install
+      bundle.clean
+      rake task
     end
 
-    def bundle_install
-      return if not gemfile_exists?
-      exitstatus = system "bundle check > /dev/null"
-      return if exitstatus
-      cmd "bundle install"
+    def rake(task)
+      bundle.rake task
     end
 
-    def env_from_yml
-      path = "config/env.yml"
-      if not File.readable? path
-        logger.debug "skipped loading env from #{path}"
-        return {}
-      end
-      require 'yaml'
-      YAML.load_file(path)
+    def report_changes(previous_version, current_version)
+      info = {}
+      info[:current] = current_version
+      info[:previous] = previous_version
+      logger.remote "#{JSON.dump info}"
     end
 
+    private
+
+    def bundle
+      @bundle ||= Bundle.new(deployment: @deployment)
+    end
 
   end
 end

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/dply/yum.rb

@@ -0,0 +1,53 @@
+require 'dply/helper'
+require 'yaml'
+
+module Dply
+  class Yum
+
+    include Helper
+
+    def initialize(pkgs_yml)
+      @pkgs_yml = pkgs_yml
+    end
+
+    def pkgs
+      @pkgs ||= load_pkgs
+    end
+
+    def install
+      return if installed?
+      cmd "sudo -n yum install -y #{not_installed_pkgs.join(' ')}"
+    end
+
+    private
+
+    def pkgs_str
+      pkgs.join " "
+    end
+
+    def not_installed_pkgs
+      @not_installed_pkgs ||= query_not_installed
+    end
+
+    def query_not_installed
+      return [] if pkgs_str.strip.empty?
+      command = "rpm -V --noscripts --nodeps --nofiles #{pkgs_str}"
+      matches = `#{command}`.scan(/^package (.*) is not installed$/)
+    end
+
+    def installed?
+      not_installed_pkgs.size == 0
+    end
+
+    def load_pkgs
+      if not File.readable? @pkgs_yml
+        logger.debug "skipping yum pkgs"
+        return []
+      end
+      YAML.load_file(@pkgs_yml)
+    rescue => e
+      error "error loading pkgs list" 
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,37 +60,40 @@ files:
 - docs/stages.rb
 - dply.gemspec
 - lib/dply.rb
+- lib/dply/archive.rb
+- lib/dply/build.rb
+- lib/dply/build_config.rb
+- lib/dply/bundle.rb
+- lib/dply/cli/build.rb
 - lib/dply/cli/deploy.rb
 - lib/dply/cli/reload.rb
 - lib/dply/config.rb
 - lib/dply/config_downloader.rb
+- lib/dply/config_struct.rb
 - lib/dply/custom_logger.rb
-- lib/dply/deploy.rb
 - lib/dply/dplyr.rb
 - lib/dply/error.rb
 - lib/dply/ext/string.rb
 - lib/dply/git.rb
 - lib/dply/helper.rb
+- lib/dply/jenkins.rb
 - lib/dply/linker.rb
 - lib/dply/lock.rb
 - lib/dply/logger.rb
 - lib/dply/release.rb
-- lib/dply/reload.rb
 - lib/dply/remote_task.rb
 - lib/dply/repo.rb
 - lib/dply/report.rb
 - lib/dply/setup.rb
-- lib/dply/setup/default.rb
-- lib/dply/setup/git.rb
-- lib/dply/setup/release.rb
 - lib/dply/shared_dirs.rb
 - lib/dply/shell.rb
 - lib/dply/stages_config.rb
 - lib/dply/strategy.rb
-- lib/dply/strategy/default.rb
+- lib/dply/strategy/archive.rb
 - lib/dply/strategy/git.rb
 - lib/dply/tasks.rb
 - lib/dply/version.rb
+- lib/dply/yum.rb
 homepage: ''
 licenses:
 - MIT

data/lib/dply/deploy.rb

@@ -1,29 +0,0 @@
-require 'dply/strategy'
-require 'dply/config'
-
-module Dply
-  class Deploy
-
-    attr_reader :deploy_dir, :config
-    attr_writer :options
-
-    def initialize(deploy_dir, config)
-      @deploy_dir = deploy_dir
-      @config = config
-    end
-
-    def run
-      strategy.deploy
-    end
-
-    def strategy
-      @strategy ||= Strategy.load(config, options)
-    end
-
-    def options
-      @options ||= {}
-    end
-
-
-  end
-end

data/lib/dply/reload.rb

@@ -1,29 +0,0 @@
-require 'dply/strategy'
-require 'dply/config'
-
-module Dply
-  class Reload
-
-    attr_reader :deploy_dir, :config
-    attr_writer :options
-
-    def initialize(deploy_dir, config)
-      @deploy_dir = deploy_dir
-      @config = config
-    end
-
-    def run
-      strategy.reload
-    end
-    
-    def strategy
-      @strategy ||= Strategy.load(config, options)
-    end
-
-    def options
-      @options ||= {}
-    end
-
-
-  end
-end

data/lib/dply/setup/default.rb

@@ -1,31 +0,0 @@
-require 'fileutils'
-require 'dply/helper'
-require 'dply/shared_dirs'
-
-module Dply
-  module Setup
-    class Default
-
-      include Helper
-
-      attr_reader :config
-
-      def initialize(config)
-        @config = config
-      end
-
-      def run
-        Dir.chdir config.deploy_dir do
-          shared_dirs.create
-        end
-      end
-
-      private
-
-      def shared_dirs
-        @shared_dirs ||= SharedDirs.new
-      end
-
-    end
-  end
-end

data/lib/dply/setup/git.rb

@@ -1,52 +0,0 @@
-require 'fileutils'
-require 'dply/helper'
-require 'dply/repo'
-require 'dply/shared_dirs'
-
-module Dply
-  module Setup
-    class Git
-
-      include Helper
-
-      attr_reader :config
-
-      def initialize(config)
-        @config = config
-      end
-
-      def run
-        Dir.chdir setup_dir do
-          repo.create
-          symlink "repo", "current"
-          create_dirs
-          shared_dirs.create_in "shared"
-        end
-      end
-
-      private
-
-      def repo
-        @repo ||= ::Dply::Repo.new(repo_dir, config.repo)
-      end
-
-      def create_dirs
-        dirs = ["config", "shared"]
-        FileUtils.mkdir_p dirs
-      end
-
-      def shared_dirs
-        @shared_dirs ||= SharedDirs.new(config.shared_dirs)
-      end
-
-      def setup_dir
-        config.deploy_dir
-      end
-
-      def repo_dir
-        "#{setup_dir}/repo"
-      end
-
-    end
-  end
-end