cocoapods-lazy 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d772616c122ea26de244839e7dd24d7cbf5accc
-  data.tar.gz: cbc468c4cb629fcc910cfe3d2d40d19116fca1ba
+  metadata.gz: 65d3ec7903729f223055ef69069f95b9ca310c14
+  data.tar.gz: 1ef030dac21fdc14cddd566344a7aeaf693d3218
 SHA512:
-  metadata.gz: 6ed1e5e47ea83776baaa152263b08f9162e9090ee4d21de4da7938e43a47f6aad086553310808fac51eed3ebf116cd036b39a16a5e29331e0e88f3910c73e344
-  data.tar.gz: 3cb70ea06bd75b055bee357112c85ba8ba5e361f976b5e1a5164b0a662d3034026c1dc98e888ac0bad2587a364d0a3f49d915dfb7277d3933b92f65800d8f58e
+  metadata.gz: 8d0f16974e0e07e0475e65319bd467cd1aa54945d0b9fbe90cee55968a40ae4ecd5b691bf1456b0174b24c54b79758bcba7cb87da53c449698b7a4ca37f146a3
+  data.tar.gz: 485e3a01b3ebf6523f4bbe89a2d40ebb67810860297f231724bee71f88f90d59bbcdeae88d00a927cf309c8d32b2d7edda9ad186db7fd61cd17881c00371aa0c

data/lib/cocoapods-lazy/dsl.rb

@@ -1,16 +1,45 @@
 require 'cocoapods'
-require 'cocoapods-lazy/credential'
+require 'cocoapods-lazy/logger'
 
 module Pod
   class Podfile
     module DSL
-      class Credential
-        attr_accessor :login
-        attr_accessor :password
+      class Config
         attr_accessor :base_url
         
-        def is_valid?
-          return login != nil && password != nil && base_url != nil
+        def validate
+          raise 'Write base_url for continue' if base_url == nil
+        end
+        
+        def login
+          return @login unless @login.nil?
+          Logger.important_i "Write login from #{@base_url}"
+          Logger.important "Write login from #{@base_url}"
+          @login = $stdin.gets
+          return @login
+        end
+        
+        def login=(login)
+          @login = Shellwords.escape(login) unless login.blank?
+        end
+        
+        def password
+          return @password unless @password.nil?
+          Logger.important_i "Write password from #{@base_url}"
+          Logger.important "Write password from #{@base_url}"
+          @password = Shellwords.escape $stdin.gets.chomp
+          return @password
+        end
+        
+        def password=(password)
+          @password = Shellwords.escape(password) unless password.blank?
+        end
+        
+        def to_s
+          descriptor = ""
+          descriptor += "login = #{@login}\n" unless @login.nil?
+          descriptor += "password = *****\n" unless @password.nil?
+          descriptor += "base_url = #{@base_url}"
         end
       end
     end
@@ -20,13 +49,13 @@ end
 module Pod
   class Podfile
     module DSL
-      class_attr_accessor :credential
+      class_attr_accessor :config
 
-      def pods_storage_credential(&block)
-        credential = Credential.new()
-        block.call(credential)
-        raise unless credential.is_valid?
-        DSL.credential = Pod::Lazy::Credential.new(credential.login, credential.password, credential.base_url)
+      def cocoapods_lazy(&block)
+        config = Config.new()
+        block.call(config)
+        config.validate
+        DSL.config = config
       end
     end
   end

data/lib/cocoapods-lazy/logger.rb

@@ -0,0 +1,15 @@
+module Pod
+  module Lazy
+    class Logger
+      def self.info(value)
+        UI.puts "#### #{value}".ansi.blue
+      end
+      
+      def self.important(value)
+        UI.puts "#### #{value}".ansi.magenta
+      end
+    end
+  end
+end
+
+Logger = Pod::Lazy::Logger

data/lib/cocoapods-lazy/main.rb

@@ -1,10 +1,10 @@
 require 'cocoapods'
+require 'cocoapods-core/podfile'
 require 'cocoapods-lazy/version'
-require 'cocoapods-lazy/log'
+require 'cocoapods-lazy/logger'
 require 'cocoapods-lazy/repository'
 require 'cocoapods-lazy/remote_storage'
 require 'cocoapods-lazy/dsl'
-require 'cocoapods-core/podfile'
 
 module Pod
   module Lazy
@@ -15,32 +15,28 @@ module Pod
     end
 
     def run
-      puts "Redirection to cocoapods-lazy"
-      credential = load_credential()
-      unless credential.nil?
-        puts "cocoapods-lazy is enabled in Podfile"
-        puts "Credentials:\n#{credential}"
-        remote_storage = Pod::Lazy::RemoteStorage.new(credential)
+      Logger.info "Redirection to cocoapods-lazy"
+      lazy_config = load_credential()
+      unless lazy_config.nil?
+        Logger.info "cocoapods-lazy is enabled in Podfile"
+        Logger.info "Lazy config:\n#{lazy_config}"
+        remote_storage = Pod::Lazy::RemoteStorage.new(lazy_config)
         repository = Pod::Lazy::Repository.new(remote_storage)
         repository.fetch() if @should_fetch
-        puts "Run origin command"
+        Logger.info "Run origin command"
         super
         if repository.should_store && @should_store
-          puts "Storing..."
+          Logger.info "Storing..."
           repository.store()
         end
-        puts "Flow cocoapods-lazy if finished"
+        Logger.info "Flow cocoapods-lazy if finished"
       else
-        puts "cocoapods-lazy is not enabled in Podfile"
-        puts "Run origin command"
+        Logger.info "cocoapods-lazy is not enabled in Podfile"
+        Logger.info "Run origin command"
         super
       end
     end
 
-    def puts(value)
-      Pod::Lazy::Log.puts(value)
-    end
-
     def options
       [
         ['--no-fetch', 'Skip fetch action'], 
@@ -53,7 +49,7 @@ module Pod
     def load_credential
       path = Pathname.new('Podfile')
       Podfile.from_file(path)
-      Pod::Podfile::DSL.credential
+      Pod::Podfile::DSL.config
     end
   end
 end

data/lib/cocoapods-lazy/remote_storage.rb

@@ -1,20 +1,16 @@
-require 'cocoapods-lazy/log'
+require 'cocoapods-lazy/logger'
 
 module Pod
   module Lazy
     class RemoteStorage
-      include Pod::Lazy::Log
-
-      def initialize(credential)
-        @login = credential.login
-        @password = credential.password
-        @base_url = credential.base_url
+      def initialize(config)
+        @config = config
       end
 
       def fetch(name:)
         zip_name = "#{name}.zip"
-        url = @base_url + zip_name
-        puts `curl --fail -v -u #{@login}:#{@password} #{url} --output #{zip_name}`
+        url = @config.base_url + zip_name
+        `curl --fail #{url} --output #{zip_name}`
         `unzip #{zip_name}`
         `rm -rf #{zip_name}`
       end
@@ -22,13 +18,13 @@ module Pod
       def store(name:)
         zip_name = "#{name}.zip"
         unless File.exist?(zip_name)
-          puts "Make zip: #{zip_name}"
+          Logger.info "Make zip: #{zip_name}"
           `zip -9 -r -y #{zip_name} Pods`
         end
-        url = @base_url + zip_name
-        puts "Storing to #{url}"
-        `curl --fail -v -u #{@login}:#{@password} --upload-file #{zip_name} #{url}`
-        puts "Remove #{zip_name}"
+        url = @config.base_url + zip_name
+        Logger.info "Storing to #{url}"
+        `curl --fail -u #{@config.login}:#{@config.password} --upload-file #{zip_name} #{url}`
+        Logger.info "Remove #{zip_name}"
         `rm -rf #{zip_name}`
       end
     end

data/lib/cocoapods-lazy/repository.rb

@@ -1,12 +1,10 @@
 require 'cocoapods-core'
 require 'fileutils'
-require 'cocoapods-lazy/log'
+require 'cocoapods-lazy/logger'
 
 module Pod
   module Lazy
     class Repository
-      include Pod::Lazy::Log
-
       def initialize(repository)
         @repository = repository
       end
@@ -14,16 +12,16 @@ module Pod
       def fetch
         @fetched_checksum = read_podfile_checksum()
         if @fetched_checksum.nil?
-          puts "Podfile.lock not found"
+          Logger.info "Podfile.lock not found"
           @is_generated_pods = true
         elsif @fetched_checksum != read_manifest_checksum()
-          puts 'Checksum IS NOT EQUAL'
-          puts 'Drop Pods directory'
+          Logger.info 'Checksum IS NOT EQUAL'
+          Logger.info 'Drop Pods directory'
           `rm -rf Pods`
           @repository.fetch(name: @fetched_checksum)
           @is_generated_pods = !Dir.exist?('Pods')
         else
-          puts 'Checksum IS EQUAL'
+          Logger.info 'Checksum IS EQUAL'
           @is_generated_pods = false
         end
       end
@@ -33,7 +31,7 @@ module Pod
       end
 
       def store
-        puts "Reason for store: #{store_reason || 'Not reason for store'}"
+        Logger.info "Reason for store: #{store_reason || 'Not reason for store'}"
         @repository.store(name: read_podfile_checksum())
       end
 

data/lib/cocoapods-lazy/version.rb

@@ -1,3 +1,3 @@
 module CocoapodsLazy
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-lazy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Artem Mylnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -59,9 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cocoapods-lazy/credential.rb
 - lib/cocoapods-lazy/dsl.rb
-- lib/cocoapods-lazy/log.rb
+- lib/cocoapods-lazy/logger.rb
 - lib/cocoapods-lazy/main.rb
 - lib/cocoapods-lazy/remote_storage.rb
 - lib/cocoapods-lazy/repository.rb

data/lib/cocoapods-lazy/credential.rb

@@ -1,21 +0,0 @@
-require 'shellwords'
-
-module Pod
-  module Lazy
-    class Credential
-      attr_reader :login
-      attr_reader :password
-      attr_reader :base_url
-      
-      def initialize(login, password, base_url)
-        @login = Shellwords.escape(login)
-        @password = Shellwords.escape(password)
-        @base_url = Shellwords.escape(base_url)
-      end
-
-      def to_s
-        "login = #{@login} \npassword = #{@password} \nbase_url = #{@base_url}"
-      end
-    end
-  end
-end

data/lib/cocoapods-lazy/log.rb

@@ -1,13 +0,0 @@
-module Pod
-  module Lazy
-    module Log
-      def puts(value)
-        Log.puts(value)
-      end
-      
-      def self.puts(value)
-        UI.puts "#### #{value}"
-      end
-    end
-  end
-end