dply 0.0.5 → 0.0.7

data/lib/dply/cli/build.rb

@@ -0,0 +1,68 @@
+require 'dply/logger'
+require 'dply/lock'
+require 'dply/build'
+require 'dply/build_config'
+
+module Dply
+  module Cli
+    class Build
+
+      include Logger
+
+      def initialize(argv)
+        @argv = argv
+      end
+
+      def run
+        lock.acquire
+        opts.parse!(@argv)
+        build.run
+      end
+
+      def build
+        @build ||= ::Dply::Build.new(config)
+      end
+
+      def config
+        @config ||= ::Dply::BuildConfig.new.to_struct
+      end
+
+      def dir
+        @dir ||= Dir.pwd
+      end
+
+      def lock
+        @lock ||= ::Dply::Lock.new
+      end
+
+      def opts
+        OptionParser.new do |opts|
+
+          opts.banner = "Usage: drake build [options] [target]"
+          
+          opts.on("-b", "--branch [BRANCH]" , "Specify git branch") do |b|
+            config.branch = b
+          end
+
+          opts.on("-r", "--revision [REVISION]", "Specify revision") do |r|
+            config.revision = r
+          end
+
+          opts.on("--no-pull", "Enable/disable git pull") do |e|
+            config.no_pull = true
+          end
+
+          opts.on("--skip-git", "Disable git") do |e|
+            config.git = false
+          end  
+
+          opts.on("-h", "--help", "Help") do
+            puts opts
+            exit
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/dply/cli/deploy.rb

@@ -1,6 +1,7 @@
 require 'dply/deploy'
 require 'dply/logger'
 require 'dply/lock'
+require 'dply/config'
 
 module Dply
   module Cli
@@ -8,29 +9,28 @@ module Dply
 
       include Logger
 
-      attr_reader :deploy_dir, :argv, :config
+      attr_reader :argv
 
-      def initialize(deploy_dir, config, argv)
-        @deploy_dir = deploy_dir
-        @config = config
+      def initialize(argv)
         @argv = argv
       end
 
       def run
         lock.acquire
         opts.parse!(argv)
-        target = argv.shift
-        config.target = target if target
-        deploy.options = options
-        deploy.run
+        strategy.deploy
       end
 
-      def deploy
-        @deploy ||= ::Dply::Deploy.new(deploy_dir, config)
+      def strategy
+        @strategy ||= Strategy.load(config, options)
       end
 
       def lock
-        @lock ||= ::Dply::Lock.new(deploy_dir)
+        @lock ||= Lock.new
+      end
+
+      def config
+       @config ||= Config.new.to_struct 
       end
 
       def opts
@@ -39,7 +39,11 @@ module Dply
           opts.banner = "Usage: dply deploy [options] [target]"
           
           opts.on("-b", "--branch [BRANCH]" , "Specify git branch") do |b|
-            options[:branch] = b
+            config.branch = b
+          end
+
+          opts.on("-r", "--revision [REVISION]", "Specify build revision (only used in archive strategy)") do |r|
+            config.revision = r
           end
 
           opts.on("--no-pull", "Enable/disable git pull") do |e|

data/lib/dply/cli/reload.rb

@@ -1,4 +1,3 @@
-require 'dply/reload'
 require 'dply/logger'
 require 'dply/lock'
 
@@ -8,45 +7,29 @@ module Dply
 
       include Logger
 
-      attr_reader :deploy_dir, :argv, :config
-
-      def initialize(deploy_dir, config, argv)
-        @deploy_dir = deploy_dir
+      def initialize(argv)
         @argv = argv
-        @config = config
       end
 
       def run
         lock.acquire
-        opts.parse!(argv)
-        target = argv.shift
-        config.target = target if target
-        reload.options = options
-        reload.run
+        strategy.deploy
       end
 
-      def reload
-        @reload ||= ::Dply::Reload.new(deploy_dir, config)
+      def strategy
+        @strategy ||= ::Dply::Strategy.load(config, options)
       end
 
-      def lock
-        @lock ||= ::Dply::Lock.new(deploy_dir)
+      def config
+        @config ||= ::Dply::Config.new(dir).to_struct
       end
 
-      def opts
-        OptionParser.new do |opts|
-
-          opts.banner = "Usage: dply reload [options] [target]"
-          
-          opts.on("--skip-bundler", "Skip bundle install") do |e|
-            options[:skip_bundler] = true
-          end
+      def dir
+        @dir ||= Dir.pwd
+      end
 
-          opts.on("-h", "--help", "Help") do
-            puts opts
-            exit
-          end
-        end
+      def lock
+        @lock ||= ::Dply::Lock.new
       end
 
       def options

data/lib/dply/config.rb

@@ -1,39 +1,36 @@
-require 'ostruct'
 require 'dply/helper'
+require 'dply/config_struct'
 
 module Dply
   class Config
 
     include Helper
-    attr_reader :deploy_dir, :read_config
+    attr_reader :read_config
 
-    def initialize(deploy_dir, read_config: true)
-      @deploy_dir = deploy_dir
+    def initialize(dir = nil, read_config: true)
+      @dir = dir || Dir.pwd
       @read_config = read_config
     end
 
+    def to_struct
+      config
+    end
+
+    private 
+
     def config
       return @config if @config
-      @config = {
-        deploy_dir: deploy_dir,
-        target: :default,
-        branch: :master,
-        strategy: :default,
-        repo: nil,
-        env: {},
-        link_config: false,
-        config_map: nil,
-        dir_map: nil,
-        shared_dirs: [],
-        config_skip_download: [],
-        config_download_url: nil
-      }
+      @config = ConfigStruct.new(@dir)
       read_from_file if read_config
       return @config
     end
 
-    def target(target)
-      set :target, target
+    def name(name)
+      set :name, name
+    end
+
+    def repo(repo)
+      set :repo, repo
     end
 
     def branch(branch)
@@ -41,74 +38,75 @@ module Dply
     end
 
     def strategy(strategy)
-      set :strategy, strategy
+      set :strategy, strategy.to_sym
     end
 
-    def repo(repo)
-      set :repo, repo
+    def target(target)
+      set :target, target
     end
 
-    def link_config(link_config)
-      set :link_config, link_config
+    def shared_dirs(dirs)
+      raise if not dirs.is_a? Array
+      set :shared_dirs, dirs
     end
 
     def config_map(map)
-      set :link_config, true
       set :config_map, map
     end
 
-    def config_skip_download(list)
-      set :config_skip_download, list
+    def dir_map(map)
+      set :dir_map, map
     end
 
     def config_download_url(url)
       set :config_download_url, url
     end
 
-
-
-    def dir_map(map)
-      set :dir_map, map
+    def config_skip_download(list)
+      set :config_skip_download, list
     end
 
-    def set_env(key, value)
-      @config[:env].store key, value
+    def verify_checksum(verify_checksum)
+      set :verify_checksum, verify_checksum
     end
 
-    def set(key, value)
-      @config.store key, value
-    end
 
-    def to_struct
-      OpenStruct.new(config)
+    def set(key, value)
+      method = "#{key}=".to_sym
+      @config.send method, value
     end
 
     def env(h)
       raise if not h.is_a? Hash
-      @config[:env] = h
-      @config[:env].each do |k,v|
+      h.each do |k,v|
         ENV[k.to_s] = v.to_s
       end
     end
 
     def config_file
-      @config_file ||= "#{deploy_dir}/dply.rb"
+      @config_file ||= begin
+        found = ["#{@dir}/deploy.rb", "#{@dir}/dply.rb"].find { |f| File.readable? f }
+        found || "#{@dir}/deploy.rb"
+      end
     end
 
-    def shared_dirs(dirs)
-      raise if not dirs.is_a? Array
-      @config[:shared_dirs] = dirs
+    def revision(&block)
+      set :revision_proc , block
+    end
+
+    def build_url(&block)
+      set :build_url_proc, block
     end
 
     def read_from_file
       if not File.readable? config_file
-        raise error "dply.rb not found in #{deploy_dir}"
+        error "deploy.rb not found in #{@dir}"
         return
       end
       instance_eval(File.read(config_file))
     rescue NoMethodError => e
-      raise error "invalid option used in config: #{e.name}"
+      error "invalid option used in config: #{e.name}"
     end
-
+  
   end
 end

data/lib/dply/config_downloader.rb

@@ -3,17 +3,15 @@ module Dply
   class ConfigDownloader
 
     include Helper
-    attr_accessor :base_url, :config_files, :config_skip_download
+    attr_writer :config_skip_download
 
-    def initialize(config_files , base_url, secret: nil, config_skip_download: [])
+    def initialize(config_files , base_url)
       @config_files = config_files
       @base_url = base_url
-      @secret = secret
-      @config_skip_download = config_skip_download
     end
 
     def download_all
-      config_files.each do |f|
+      @config_files.each do |f|
         if config_skip_download.include? f
           logger.debug "skipping to download file #{f}"
           next
@@ -22,14 +20,21 @@ module Dply
       end
     end
 
+    private
+
     def download(file)
-      url = "#{base_url}/#{file}"
+      url = "#{@base_url}/#{file}"
       logger.bullet "downloading #{file}"
       http_status = `curl -w "%{http_code}" -f -s -o 'config/#{file}' '#{url}' `
       if http_status != "200"
-        raise error "failed to download #{file}, http status #{http_status}"
+        error "failed to download #{file}, http status #{http_status}"
       end
     end
 
+
+    def config_skip_download
+      @config_skip_download ||= []
+    end
+
   end
 end

data/lib/dply/config_struct.rb

@@ -0,0 +1,41 @@
+require 'dply/jenkins'
+module Dply
+  class ConfigStruct
+
+    attr_writer :revision, :build_url, :build_url_proc, 
+                :revision_proc
+    attr_accessor :dir, :name, :repo, :branch, 
+                  :strategy, :target, :verify_checksum, 
+                  :config_map, :dir_map, :shared_dirs, 
+                  :config_download_url, :config_skip_download 
+
+    def initialize(dir = nil)
+      @dir = dir || Dir.pwd
+      @target = :default
+      @branch = :master
+      @verify_checksum = true
+    end
+
+    def revision
+      @revision ||= instance_eval(&revision_proc)
+    end
+
+    def build_url
+      @build_url ||= instance_eval(&build_url_proc)
+    end
+
+    def revision_proc
+      @revision_proc ||= Proc.new do
+        jenkins = Jenkins.new(repo, name)
+        jenkins.latest_successful_revision
+      end
+    end
+
+    def build_url_proc
+      @build_url_proc ||= Proc.new do
+        "#{repo.chomp("/")}/job/#{name}/#{revision}/artifact/build/#{name}-#{revision}-#{branch}.tar.gz"
+      end
+    end
+
+  end
+end

data/lib/dply/custom_logger.rb

@@ -3,6 +3,8 @@ require 'dply/ext/string'
 module Dply
   class CustomLogger < ::Logger
 
+    attr_writer :trace_mode, :remote_mode
+
     def initialize(file)
       super(file)
       @level = ::Logger::INFO
@@ -17,7 +19,7 @@ module Dply
       when "WARN"
         "#{severity.downcase.bold.yellow} #{msg}\n"
       else
-        "#{severity.downcase.bold.blue} #{msg}\n"
+        "#{severity[0].bold.blue} #{msg}\n"
       end
     end
 
@@ -25,5 +27,15 @@ module Dply
       puts "#{"\u2219".bold.blue} #{msg}"
     end
 
+    def trace(msg)
+      return if not @trace_mode
+      puts %(#{"T".bold.blue} #{msg}\n)
+    end
+
+    def remote(msg)
+      return if not @remote_mode
+      puts %{dply_msg|#{msg}}
+    end
+
   end
 end