dependencyswapper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b373936514939c9ba4f38cb9ad43fad3e4e91e1
-  data.tar.gz: 471edad590870e8bdc9e4dac498eb70eb750bd75
+  metadata.gz: 891c705a70bf7123600a98e8b7f515669c9b36b7
+  data.tar.gz: e3ac88621bc578d83200fe6976eb096f54720027
 SHA512:
-  metadata.gz: 15734e45c6922250e765593a6cea6b39ac09119fe8c5e75c2d7293ffb68abe2fbe290fc6f7fdb81bfcc11bfd0b7292bb424b42fc0f9ad2ceadfdb927504a0411
-  data.tar.gz: 4da67691c32609ff683e8973fcad9c1cc2a3716b4374fd8dd5d73eda7b77fef4399dc91b03399e3457f98eee4a98c76f703c5cdaad4fe55f783c3d27707e4544
+  metadata.gz: a819f609bdedb5025c7f12a1b6cdf0fc30af4018074f42a1dd60ce0531f7359650f848c4a72b4f9d386fd51bbe8cd00b51df1ec8f7134234918380825f6c580f
+  data.tar.gz: f937c2f937e203a9cff4aa1f24f660aa49e9cbbd8afb5439cf49a428cdded0defcfef05cb5b73cca3ca41276539a79187b38ef89694cc9a382c34642c7ba48ac

data/dependencyswapper.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
+  # if spec.respond_to?(:metadata)
+  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+  # else
+  #   raise "RubyGems 2.0 or newer is required to protect against " \
+  #     "public gem pushes."
+  # end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

data/lib/dependencyswapper/DependencyReplacer.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'tempfile'
 require 'json'
 require 'find'
+require "dependencyswapper/graph.rb"
 
 module Dependency
 	class DependencyReplacer
@@ -21,9 +22,21 @@ module Dependency
 		end
 
 		def run
+			graph = Dependency::Graph.new({
+				 			 	:podfilelock_path => @podfile_path + ".lock"
+			})
+			pods = graph.generate()
+
+			#tag variable to store the version
+			tag = ""
+
+			pods.each { |pod|
+				if pod.name.eql? @dependency_name
+					tag = pod.version
+				end
+			}
+
 			file_lines = ''
-			# file = File.read("#{Dir.home}/.depswapper/depmapper.json")
-			# dependency_replacements = JSON.parse(file)
 
 			IO.readlines(@podfile_path).each do |line|
 	 			 file_lines += line unless line.include? "'" + dependency_name + "'"
@@ -37,11 +50,16 @@ module Dependency
 	 			 	if remote_url.to_s.empty?
   						puts "You are missing the dependency mapping for " + dependency_name + "."
 					else
-						url_extension = File.extname(remote_url) 
+						url_extension = File.extname(remote_url)
 						if url_extension.to_s.empty?
 							remote_url = remote_url + ".git"
 						end
-	 			 		file_lines += "pod '" + @dependency_name + "', :git => '" + remote_url + "'\n"
+
+						if tag.length > 0
+							file_lines += "pod '" + @dependency_name + "', :git => '" + remote_url + "', :tag => '" + tag + "'\n"
+	 			 		else
+	 			 			file_lines += "pod '" + @dependency_name + "', :git => '" + remote_url + "'\n"
+	 			 		end
 	 			 	end
 	 			 end
 			end
@@ -64,13 +82,17 @@ module Dependency
 	 			 	remote_url = dependency_replacements["homepage"]
 	 			 	if remote_url.to_s.empty?
   						puts "You are missing the dependency mapping for " + dependency_name + "."
-					else 
-						url_extension = File.extname(remote_url) 
+					else
+						url_extension = File.extname(remote_url)
 						if url_extension.to_s.empty?
 							remote_url = remote_url + ".git"
 						end
 						unless File.directory?("dev-#{dependency_name}")
-							`git clone #{remote_url} dev-#{dependency_name}`
+							if tag.length > 0
+								`git clone --branch #{tag} #{remote_url} dev-#{dependency_name}`
+							else
+								`git clone #{remote_url} dev-#{dependency_name}`
+							end
 						end
 	 			 		file_lines += "pod '" + @dependency_name + "', :path => './dev-" + dependency_name + "/'\n"
 	 			 	end
@@ -83,4 +105,4 @@ module Dependency
 			`pod install`
 		end
 	end
-end
+end

data/lib/dependencyswapper/graph.rb

@@ -0,0 +1,60 @@
+require "dependencyswapper/pod.rb"
+require "dependencyswapper/stringextractor.rb"
+require 'fileutils'
+require 'tempfile'
+
+#This class generates the dependency graph by retrieving its Pod with its dependencies
+module Dependency
+	class Graph
+		attr_reader :podfilelock_path
+
+		def self.perform(options)
+			new(options).perform
+		end
+
+		def initialize(options)
+			@podfilelock_path = options.fetch(:podfilelock_path)
+			@pods = Array.new()
+			if !File.exist?(@podfilelock_path)
+				puts "The Podfile.lock is missing. We will run pod install so we can generate the dependency graph to swap dependencies."
+				`pod install`
+			end
+		end
+
+		def generate
+			pod = nil
+
+			#Read line by line the Podfile.lock
+			IO.readlines(@podfilelock_path).each do |line|
+				#If we are generating the depdency map of a pod, and we have a pod,
+				# and the line includes a depdendency(we know cause there is a parenthesis determining a version in it),
+				# then we add the dependency name to the pod.dependencies
+				 if pod && (line.include?("=") || line.include?("~"))
+				 	dependency = line.string_between_markers("- ", " (")
+					pod.dependencies.push(dependency)
+				 end
+
+				 #At this point we found a Pod, lets build it and add its dependencies to it. We know we found a pod since
+				 #the podfile.lock will show only the version.
+	 			 unless line.include?("=") || line.include?("~")
+	 			 	# We are going to generate a new pod but we are carrying one already, we will push it to the pods array first before we clear the variable with a new pod.
+	 			 	if pod != nil
+	 			 		@pods.push(pod)
+	 			 	end
+	 			 	name = line.string_between_markers("- ", " (")
+	 			 	version = line.string_between_markers("(", ")")
+	 			 	pod = Dependency::Pod.new({
+	 			 			:name => name,
+	 			 			:version => version
+	 			 	})
+	 			 end
+
+	 			 unless line.include?("(") || line.include?(":")
+	 			 	return @pods
+	 			 end
+			end
+			return @pods
+		end
+
+	end
+end

data/lib/dependencyswapper/pod.rb

@@ -0,0 +1,16 @@
+#This class is a model for the Pod
+module Dependency
+	class Pod
+		attr_reader :name, :version, :dependencies
+
+		def self.perform(options)
+			new(options).perform
+		end
+
+		def initialize(options)
+			@name = options.fetch(:name)
+			@version = options.fetch(:version)
+			@dependencies = Array.new
+		end
+	end
+end

data/lib/dependencyswapper/stringextractor.rb

@@ -0,0 +1,5 @@
+class String
+	def string_between_markers marker1, marker2
+		self[/#{Regexp.escape(marker1)}(.*?)#{Regexp.escape(marker2)}/m, 1]
+	end
+end

data/lib/dependencyswapper/version.rb

@@ -1,3 +1,3 @@
 module Dependencyswapper
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dependencyswapper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Marc Terns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The dependencyswapper allows developers to switch between non source
@@ -77,7 +77,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
+- ".DS_Store"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -88,22 +88,19 @@ files:
 - bin/console
 - bin/depswapper
 - bin/setup
-- dependencyswapper-0.1.0.gem
 - dependencyswapper.gemspec
-- lib/.DS_Store
 - lib/dependencyswapper.rb
-- lib/dependencyswapper/.DS_Store
 - lib/dependencyswapper/DependencyReplacer.rb
 - lib/dependencyswapper/cli.rb
+- lib/dependencyswapper/graph.rb
+- lib/dependencyswapper/pod.rb
+- lib/dependencyswapper/stringextractor.rb
 - lib/dependencyswapper/version.rb
-- pkg/dependencyswapper-0.1.0.gem
-- pkg/dependencyswapper-0.2.0.gem
-- pkg/dependencyswapper-0.3.0.gem
+- pkg/dependencyswapper-0.5.0.gem
 homepage: https://github.com/pkrmf/dependencyswapper
 licenses:
 - MIT
-metadata:
-  allowed_push_host: 'TODO: Set to ''http://mygemserver.com'''
+metadata: {}
 post_install_message: Thanks for installing! Make sure to run `depswapper setup` command
   before start using depswapper!
 rdoc_options: []
@@ -111,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Swaps the cocoapods dependencies between a production environment and a test/development