From ac0aa49bc5e6129c1b16df293042f79089648161 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Fri, 1 May 2020 11:15:23 +0530
Subject: [PATCH 01/24] =?UTF-8?q?=E2=97=80=EF=B8=8F=20building=20dagger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  9 +++--
 .../gpm/core/GpmDependencyCollector.kt        | 11 -------
 .../gpm/core/MavenDependencyCollector.kt      | 10 ------
 .../theapache64/gpm/core/RegistryManager.kt   |  4 +--
 ...DependencyCollector.kt => BaseRegistry.kt} |  3 +-
 .../core/registries/gpm/GpmApiInterface.kt    | 11 +++++++
 .../gpm/core/registries/gpm/GpmRegistry.kt    | 19 +++++++++++
 .../registries/maven/MavenApiInterface.kt     |  5 +++
 .../core/registries/maven/MavenRegistry.kt    | 17 ++++++++++
 .../gpm/di/modules/NetworkModule.kt           | 33 +++++++++++++++++++
 .../com/theapache64/gpm/models/Dependency.kt  | 15 ++++-----
 11 files changed, 103 insertions(+), 34 deletions(-)
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/core/GpmDependencyCollector.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/core/MavenDependencyCollector.kt
 rename src/main/kotlin/com/theapache64/gpm/core/base/{BaseDependencyCollector.kt => BaseRegistry.kt} (65%)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmApiInterface.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenApiInterface.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt

diff --git a/build.gradle b/build.gradle
index b28abe7..d6481a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,8 +25,13 @@ dependencies {
     implementation 'info.picocli:picocli:4.2.0'
     kapt 'info.picocli:picocli-codegen:4.2.0'
 
-    // Gson
-    implementation 'com.google.code.gson:gson:2.8.6'
+    // Retrofit
+    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-moshi:2.8.1'
+
+    // Dagger
+    implementation 'com.google.dagger:dagger:2.27'
+    kapt 'com.google.dagger:dagger-compiler:2.27'
 
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     testImplementation 'com.winterbe:expekt:0.5.0'
diff --git a/src/main/kotlin/com/theapache64/gpm/core/GpmDependencyCollector.kt b/src/main/kotlin/com/theapache64/gpm/core/GpmDependencyCollector.kt
deleted file mode 100644
index 0e700ba..0000000
--- a/src/main/kotlin/com/theapache64/gpm/core/GpmDependencyCollector.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.theapache64.gpm.core
-
-import com.theapache64.gpm.core.base.BaseDependencyCollector
-import com.theapache64.gpm.models.Dependency
-
-object GpmDependencyCollector : BaseDependencyCollector {
-
-    override fun getDependency(name: String): Dependency? {
-        TODO("Not yet implemented")
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/MavenDependencyCollector.kt b/src/main/kotlin/com/theapache64/gpm/core/MavenDependencyCollector.kt
deleted file mode 100644
index 9eaedc3..0000000
--- a/src/main/kotlin/com/theapache64/gpm/core/MavenDependencyCollector.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.theapache64.gpm.core
-
-import com.theapache64.gpm.core.base.BaseDependencyCollector
-import com.theapache64.gpm.models.Dependency
-
-object MavenDependencyCollector : BaseDependencyCollector {
-    override fun getDependency(name: String): Dependency? {
-        TODO("Not yet implemented")
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt b/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
index c5ddf98..b0d7953 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
@@ -1,12 +1,12 @@
 package com.theapache64.gpm.core
 
+import com.theapache64.gpm.core.registries.gpm.GpmRegistry
 import com.theapache64.gpm.models.Dependency
 
 object RegistryManager {
 
-
     private val dependencyCollectors = listOf(
-        GpmDependencyCollector
+        GpmRegistry
     )
 
     /**
diff --git a/src/main/kotlin/com/theapache64/gpm/core/base/BaseDependencyCollector.kt b/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
similarity index 65%
rename from src/main/kotlin/com/theapache64/gpm/core/base/BaseDependencyCollector.kt
rename to src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
index 68de208..69c898b 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/base/BaseDependencyCollector.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
@@ -2,6 +2,7 @@ package com.theapache64.gpm.core.base
 
 import com.theapache64.gpm.models.Dependency
 
-interface BaseDependencyCollector {
+interface BaseRegistry {
+    fun getDependencyUrl(name: String): String
     fun getDependency(name: String): Dependency?
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmApiInterface.kt
new file mode 100644
index 0000000..4e77d60
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmApiInterface.kt
@@ -0,0 +1,11 @@
+package com.theapache64.gpm.core.registries.gpm
+
+import com.theapache64.gpm.models.Dependency
+import retrofit2.http.GET
+
+interface GpmApiInterface {
+
+    @GET("https://raw.githubusercontent.com/theapache64/gpm/master/registry/{name}.json")
+    suspend fun getDependency(): Dependency
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
new file mode 100644
index 0000000..096df22
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
@@ -0,0 +1,19 @@
+package com.theapache64.gpm.core.registries.gpm
+
+import com.theapache64.gpm.core.base.BaseRegistry
+import com.theapache64.gpm.models.Dependency
+import java.net.URLEncoder
+
+object GpmRegistry : BaseRegistry {
+
+    override fun getDependencyUrl(name: String): String {
+        val nameEnc = URLEncoder.encode(name, "UTF-8")
+        return "https://raw.githubusercontent.com/theapache64/gpm/master/registry/$nameEnc.json"
+    }
+
+    override fun getDependency(name: String): Dependency? {
+        val url = getDependencyUrl(name)
+
+        return null
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenApiInterface.kt
new file mode 100644
index 0000000..83419b8
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenApiInterface.kt
@@ -0,0 +1,5 @@
+package com.theapache64.gpm.core.registries.maven
+
+interface MavenApiInterface {
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
new file mode 100644
index 0000000..855b797
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
@@ -0,0 +1,17 @@
+package com.theapache64.gpm.core.registries.maven
+
+import com.theapache64.gpm.core.base.BaseRegistry
+import com.theapache64.gpm.models.Dependency
+import java.net.URLEncoder
+
+object MavenRegistry : BaseRegistry {
+
+    override fun getDependencyUrl(name: String): String {
+        val nameEnc = URLEncoder.encode(name, "UTF-8")
+        return "https://search.maven.org/solrsearch/select?q=${nameEnc}okhttp&rows=1&wt=json"
+    }
+
+    override fun getDependency(name: String): Dependency? {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
new file mode 100644
index 0000000..18c308c
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
@@ -0,0 +1,33 @@
+package com.theapache64.gpm.di.modules
+
+import com.theapache64.gpm.core.registries.gpm.GpmApiInterface
+import com.theapache64.gpm.core.registries.maven.MavenApiInterface
+import dagger.Module
+import dagger.Provides
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import javax.inject.Singleton
+
+@Module
+class NetworkModule {
+
+    @Singleton
+    @Provides
+    fun provideRetrofit(): Retrofit {
+        return Retrofit.Builder()
+            .addConverterFactory(MoshiConverterFactory.create())
+            .build()
+    }
+
+    @Singleton
+    @Provides
+    fun provideGpmApiInterface(retrofit: Retrofit): GpmApiInterface {
+        return retrofit.create(GpmApiInterface::class.java)
+    }
+
+    @Singleton
+    @Provides
+    fun provideMavenApiInterface(retrofit: Retrofit): MavenApiInterface {
+        return retrofit.create(MavenApiInterface::class.java)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/models/Dependency.kt b/src/main/kotlin/com/theapache64/gpm/models/Dependency.kt
index d68b1e1..b268929 100644
--- a/src/main/kotlin/com/theapache64/gpm/models/Dependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/models/Dependency.kt
@@ -1,19 +1,18 @@
 package com.theapache64.gpm.models
 
-import com.google.gson.annotations.SerializedName
-
+import com.squareup.moshi.Json
 
 data class Dependency(
-    @SerializedName("default_type")
+    @Json(name = "default_type")
     val defaultType: String, // implementation
-    @SerializedName("dependency_signature")
+    @Json(name = "dependency_signature")
     val dependencySignature: String, // com.squareup.okhttp3:okhttp
-    @SerializedName("docs")
+    @Json(name = "docs")
     val docs: String, // https://square.github.io/okhttp/
-    @SerializedName("github")
+    @Json(name = "github")
     val github: String, // square/okhttp
-    @SerializedName("latest_version")
+    @Json(name = "latest_version")
     val latestVersion: String, // 4.6.0
-    @SerializedName("name")
+    @Json(name = "name")
     val name: String // OkHttp
 )
\ No newline at end of file

From d671c9b1d62614ae4720f5e9c10b80a750f2c9a9 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Fri, 1 May 2020 12:17:52 +0530
Subject: [PATCH 02/24] =?UTF-8?q?=E2=97=80=EF=B8=8F=20adpot=20semi-MVVM=20?=
 =?UTF-8?q?architecture?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/jarRepositories.xml                     |  5 +++
 build.gradle                                  | 19 ++++++++
 .../gpm/commands/subcommands/Install.kt       | 25 ++++++++++-
 .../core/registries/gpm/GpmApiInterface.kt    | 11 -----
 .../registries/maven/MavenApiInterface.kt     |  5 ---
 .../gpm/data/remote/GpmApiInterface.kt        | 14 ++++++
 .../gpm/data/remote/MavenApiInterface.kt      |  5 +++
 .../com/theapache64/gpm/data/repos/GpmRepo.kt | 23 ++++++++++
 .../theapache64/gpm/data/repos/MavenRepo.kt   |  8 ++++
 .../gpm/di/components/InstallComponent.kt     | 12 +++++
 .../gpm/di/modules/NetworkModule.kt           | 32 +++++++++++---
 .../com/theapache64/gpm/utils/GsonUtils.kt    | 10 -----
 .../gpm/commands/subcommands/InstallTest.kt   | 21 +++++++--
 .../theapache64/gpm/data/repos/GpmRepoTest.kt | 44 +++++++++++++++++++
 14 files changed, 195 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmApiInterface.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenApiInterface.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/MavenApiInterface.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/utils/GsonUtils.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index fdc392f..f5a0c5d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,5 +16,10 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d6481a6..8325fc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,7 @@ version 'v1.0.0-alpha01'
 
 repositories {
     mavenCentral()
+    maven { url "https://jitpack.io" }
 }
 
 kapt {
@@ -28,14 +29,32 @@ dependencies {
     // Retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.8.1'
     implementation 'com.squareup.retrofit2:converter-moshi:2.8.1'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.9.2'
+
 
     // Dagger
     implementation 'com.google.dagger:dagger:2.27'
     kapt 'com.google.dagger:dagger-compiler:2.27'
 
+    // Coroutines
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.5'
+
+    // Junit
     testImplementation group: 'junit', name: 'junit', version: '4.12'
+
+    // ExpeKt
     testImplementation 'com.winterbe:expekt:0.5.0'
 
+    // Mockito inline
+    testImplementation 'org.mockito:mockito-inline:3.3.3'
+
+    // Mockito-koltin
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+
+    // DaggerMock
+    testImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
+    testImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
 }
 
 compileKotlin {
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
index fa5e783..df5cd2e 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
@@ -1,7 +1,11 @@
 package com.theapache64.gpm.commands.subcommands
 
+import com.theapache64.gpm.data.repos.GpmRepo
+import com.theapache64.gpm.di.components.DaggerInstallComponent
+import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import java.util.concurrent.Callable
+import javax.inject.Inject
 
 @CommandLine.Command(
     name = "install",
@@ -10,6 +14,18 @@ import java.util.concurrent.Callable
 )
 class Install : Callable<Int> {
 
+    companion object {
+        const val RESULT_REPO_FOUND = 200
+        const val RESULT_REPO_NOT_FOUND = 404
+    }
+
+    @Inject
+    lateinit var gpmRepo: GpmRepo
+
+    init {
+        DaggerInstallComponent.create().inject(this)
+    }
+
     @CommandLine.Option(
         names = ["-S", "--save"],
         description = ["To install the dependency as 'implementation'"]
@@ -31,14 +47,19 @@ class Install : Callable<Int> {
     @CommandLine.Parameters(index = "0", description = ["Dependency name"])
     lateinit var dependencyName: String
 
-    override fun call(): Int {
+    override fun call(): Int = runBlocking {
+
+        dependencyName = dependencyName.trim().toLowerCase()
+
+        // first get from
+        val gpmDependency = gpmRepo.getDependency(dependencyName) ?: return@runBlocking RESULT_REPO_NOT_FOUND
 
         // if all save flags are null, then isSave will be enabled
         if (isSave == null && isSaveDev == null && isSaveDevAndroid == null) {
             isSave = true
         }
 
-        return 0
+        RESULT_REPO_FOUND
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmApiInterface.kt
deleted file mode 100644
index 4e77d60..0000000
--- a/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmApiInterface.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.theapache64.gpm.core.registries.gpm
-
-import com.theapache64.gpm.models.Dependency
-import retrofit2.http.GET
-
-interface GpmApiInterface {
-
-    @GET("https://raw.githubusercontent.com/theapache64/gpm/master/registry/{name}.json")
-    suspend fun getDependency(): Dependency
-
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenApiInterface.kt
deleted file mode 100644
index 83419b8..0000000
--- a/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenApiInterface.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.theapache64.gpm.core.registries.maven
-
-interface MavenApiInterface {
-
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt
new file mode 100644
index 0000000..1bea98e
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt
@@ -0,0 +1,14 @@
+package com.theapache64.gpm.data.remote
+
+import com.theapache64.gpm.models.Dependency
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+interface GpmApiInterface {
+
+    @GET("master/registry/{name}.json")
+    suspend fun getDependency(
+        @Path("name") repoName: String
+    ): Dependency
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/MavenApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/MavenApiInterface.kt
new file mode 100644
index 0000000..a8df1eb
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/MavenApiInterface.kt
@@ -0,0 +1,5 @@
+package com.theapache64.gpm.data.remote
+
+interface MavenApiInterface {
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
new file mode 100644
index 0000000..0a5e1af
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
@@ -0,0 +1,23 @@
+package com.theapache64.gpm.data.repos
+
+import com.theapache64.gpm.data.remote.GpmApiInterface
+import com.theapache64.gpm.models.Dependency
+import retrofit2.HttpException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GpmRepo @Inject constructor(
+    private val gpmApiInterface: GpmApiInterface
+) {
+    /**
+     * To get dependency from GPM github registry
+     */
+    suspend fun getDependency(dependencyName: String): Dependency? {
+        return try {
+            gpmApiInterface.getDependency(dependencyName)
+        } catch (e: HttpException) {
+            null
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
new file mode 100644
index 0000000..0c9f5fc
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
@@ -0,0 +1,8 @@
+package com.theapache64.gpm.data.repos
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MavenRepo @Inject constructor() {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
new file mode 100644
index 0000000..980b96e
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -0,0 +1,12 @@
+package com.theapache64.gpm.di.components
+
+import com.theapache64.gpm.commands.subcommands.Install
+import com.theapache64.gpm.di.modules.NetworkModule
+import dagger.Component
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [NetworkModule::class])
+interface InstallComponent {
+    fun inject(install: Install)
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
index 18c308c..ab1452e 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
@@ -1,7 +1,9 @@
 package com.theapache64.gpm.di.modules
 
-import com.theapache64.gpm.core.registries.gpm.GpmApiInterface
-import com.theapache64.gpm.core.registries.maven.MavenApiInterface
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import com.theapache64.gpm.data.remote.GpmApiInterface
+import com.theapache64.gpm.data.remote.MavenApiInterface
 import dagger.Module
 import dagger.Provides
 import retrofit2.Retrofit
@@ -13,16 +15,32 @@ class NetworkModule {
 
     @Singleton
     @Provides
-    fun provideRetrofit(): Retrofit {
-        return Retrofit.Builder()
-            .addConverterFactory(MoshiConverterFactory.create())
+    fun provideKotlinJsonAdapterFactory(): KotlinJsonAdapterFactory {
+        return KotlinJsonAdapterFactory()
+    }
+
+    @Singleton
+    @Provides
+    fun provideMoshi(kotlinJsonAdapter: KotlinJsonAdapterFactory): Moshi {
+        return Moshi.Builder()
+            .add(kotlinJsonAdapter)
             .build()
     }
 
     @Singleton
     @Provides
-    fun provideGpmApiInterface(retrofit: Retrofit): GpmApiInterface {
-        return retrofit.create(GpmApiInterface::class.java)
+    fun provideRetrofit(moshi: Moshi): Retrofit.Builder {
+        return Retrofit.Builder()
+            .addConverterFactory(MoshiConverterFactory.create(moshi))
+    }
+
+    @Singleton
+    @Provides
+    fun provideGpmApiInterface(retrofitBuilder: Retrofit.Builder): GpmApiInterface {
+        return retrofitBuilder
+            .baseUrl("https://raw.githubusercontent.com/theapache64/gpm/")
+            .build()
+            .create(GpmApiInterface::class.java)
     }
 
     @Singleton
diff --git a/src/main/kotlin/com/theapache64/gpm/utils/GsonUtils.kt b/src/main/kotlin/com/theapache64/gpm/utils/GsonUtils.kt
deleted file mode 100644
index 44523d1..0000000
--- a/src/main/kotlin/com/theapache64/gpm/utils/GsonUtils.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.theapache64.gpm.utils
-
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-
-object GsonUtils {
-    private val gson = GsonBuilder()
-        .setPrettyPrinting()
-        .create()
-}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index 4eae3b1..2194640 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -2,6 +2,7 @@ package com.theapache64.gpm.commands.subcommands
 
 import com.theapache64.gpm.commands.Gpm
 import com.winterbe.expekt.should
+import org.junit.Before
 import org.junit.Test
 import picocli.CommandLine
 import java.io.PrintWriter
@@ -9,12 +10,24 @@ import java.io.StringWriter
 
 class InstallTest {
 
-    @Test
-    fun test() {
+    private lateinit var cmd: CommandLine
+
+    @Before
+    fun setUp() {
         val gpm = Gpm()
-        val cmd = CommandLine(gpm)
+        this.cmd = CommandLine(gpm)
         cmd.out = PrintWriter(StringWriter())
+    }
+
+    @Test
+    fun whenValidRepoInstall_thenSuccess() {
         val exitCode = cmd.execute("install", "okhttp")
-        exitCode.should.equal(100)
+        exitCode.should.equal(Install.RESULT_REPO_FOUND)
+    }
+
+    @Test
+    fun whenInvalidRepoInstall_thenError() {
+        val exitCode = cmd.execute("install", "ghdfghfgh")
+        exitCode.should.equal(Install.RESULT_REPO_NOT_FOUND)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
new file mode 100644
index 0000000..f626544
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
@@ -0,0 +1,44 @@
+package com.theapache64.gpm.data.repos
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import com.theapache64.gpm.data.remote.GpmApiInterface
+import com.winterbe.expekt.should
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.Before
+import org.junit.Test
+
+@ExperimentalCoroutinesApi
+class GpmRepoTest {
+
+    private val validRepoName = "okhttp"
+    private val invalidRepoName = "fgsdfgsdfj"
+
+    private lateinit var gmpRepo: GpmRepo
+
+    @Before
+    fun setUp() = runBlockingTest {
+        val fakeApiInterface: GpmApiInterface = mock()
+
+        whenever(fakeApiInterface.getDependency(validRepoName))
+            .thenReturn(mock())
+
+        whenever(fakeApiInterface.getDependency(invalidRepoName))
+            .thenThrow(RuntimeException())
+
+        gmpRepo = GpmRepo(fakeApiInterface)
+    }
+
+    @Test
+    fun whenValidRepo_thenSuccess() = runBlockingTest {
+        gmpRepo.getDependency(validRepoName).should.not.`null`
+    }
+
+    @Test(expected = RuntimeException::class)
+    fun whenValidRepo_thenError() = runBlockingTest {
+        gmpRepo.getDependency(invalidRepoName).should.not.`null`
+    }
+
+
+}
\ No newline at end of file

From f6bdcd527fad0d22c40815c06ca3c913c1705814 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Sun, 3 May 2020 14:58:01 +0530
Subject: [PATCH 03/24] =?UTF-8?q?=F0=9F=8C=9F=20add=20'getDependency=20and?=
 =?UTF-8?q?=20addDependency'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/build.gradle                           | 140 ++++++++++++++++++
 assets/sample.build.gradle                    | 139 +++++++++++++++++
 build.gradle                                  |   2 +-
 .../gpm/commands/subcommands/Install.kt       |   4 +
 .../theapache64/gpm/core/RegistryManager.kt   |   4 +-
 .../theapache64/gpm/core/base/BaseRegistry.kt |   4 +-
 .../gpm/core/gm/GradleDependency.kt           |  25 ++++
 .../theapache64/gpm/core/gm/GradleManager.kt  |  65 ++++++++
 .../gpm/core/registries/gpm/GpmRegistry.kt    |   4 +-
 .../core/registries/maven/MavenRegistry.kt    |   4 +-
 .../gpm/data/remote/GpmApiInterface.kt        |   4 +-
 .../com/theapache64/gpm/data/repos/GpmRepo.kt |   4 +-
 .../gpm/di/components/InstallComponent.kt     |   3 +-
 .../gpm/di/modules/GradleModule.kt            |  31 ++++
 .../{Dependency.kt => RegistryDependency.kt}  |   2 +-
 .../com/theapache64/gpm/utils/GpmConfig.kt    |   5 +
 .../gpm/core/gm/GradleDependencyTest.kt       |  52 +++++++
 .../gpm/utils/GradleManagerTest.kt            |  37 +++++
 18 files changed, 514 insertions(+), 15 deletions(-)
 create mode 100644 assets/build.gradle
 create mode 100644 assets/sample.build.gradle
 create mode 100644 src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
 rename src/main/kotlin/com/theapache64/gpm/models/{Dependency.kt => RegistryDependency.kt} (94%)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/utils/GpmConfig.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/core/gm/GradleDependencyTest.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt

diff --git a/assets/build.gradle b/assets/build.gradle
new file mode 100644
index 0000000..9d76535
--- /dev/null
+++ b/assets/build.gradle
@@ -0,0 +1,140 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlin-android-extensions'
+    id "org.jetbrains.kotlin.plugin.allopen" version "$kotlin_version"
+}
+
+allOpen {
+    annotation("com.thinkpalm.test.movieapp.utils.test.OpenForTesting")
+}
+
+android {
+    compileSdkVersion compile_sdk_version
+    defaultConfig {
+        applicationId "com.thinkpalm.test.movieapp"
+        minSdkVersion min_sdk_version
+        targetSdkVersion target_sdk_version
+        versionCode 10001
+        versionName "1.0.0-alpha01"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    buildFeatures {
+        dataBinding true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    // To make `sharedTest` accessible from both unit test and instrumentation test
+    sourceSets {
+        String sharedTestDir = 'src/sharedTest/java'
+        test {
+            java.srcDir sharedTestDir
+        }
+        androidTest {
+            java.srcDir sharedTestDir
+        }
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources true
+            returnDefaultValues true
+        }
+    }
+}
+
+dependencies {
+
+    //Core
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
+    implementation "androidx.core:core-ktx:$ktx_version"
+    implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
+    implementation "com.google.android.material:material:$material_version"
+
+    // Coroutines
+    def coroutines_version = '1.3.5'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
+
+    // Lifecycle extension
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+
+    // Dagger 2
+    def dagger_version = '2.27'
+    implementation "com.google.dagger:dagger:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+
+
+    // MaterialColors
+    implementation 'com.theah64.materialcolors:materialcolors:1.0.0'
+
+    // TwinKill
+    def twinkill_version = '1.1.0-alpha05'
+    implementation "com.theapache64.twinkill:core:$twinkill_version"
+    testImplementation "com.theapache64.twinkill:test:$twinkill_version"
+    androidTestImplementation "com.theapache64.twinkill:test:$twinkill_version"
+    implementation "com.theapache64.twinkill:logger:$twinkill_version"
+
+    // Moshi
+    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
+
+    // Test
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
+    testImplementation "org.mockito:mockito-inline:$mockito_version"
+    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
+    testImplementation('com.winterbe:expekt:0.5.0') {
+        exclude group: "org.jetbrains.kotlin"
+    }
+
+    // Robolectric
+    testImplementation "org.robolectric:robolectric:4.3.1"
+
+    // Mocktio Kotlin
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+    androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+
+    // Arch testing
+    def core_testing_version = '2.1.0'
+    testImplementation "androidx.arch.core:core-testing:$core_testing_version"
+    androidTestImplementation "androidx.arch.core:core-testing:$core_testing_version"
+    testImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+
+    // Espresso
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation('com.schibsted.spain:barista:3.4.0') {
+        exclude group: 'org.jetbrains.kotlin'
+    }
+
+    // DaggerMock
+    testImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
+    androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
+    testImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
+    androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
+    implementation 'myGroup:myArtifcat:myVersion'
+}
diff --git a/assets/sample.build.gradle b/assets/sample.build.gradle
new file mode 100644
index 0000000..7efb625
--- /dev/null
+++ b/assets/sample.build.gradle
@@ -0,0 +1,139 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlin-android-extensions'
+    id "org.jetbrains.kotlin.plugin.allopen" version "$kotlin_version"
+}
+
+allOpen {
+    annotation("com.thinkpalm.test.movieapp.utils.test.OpenForTesting")
+}
+
+android {
+    compileSdkVersion compile_sdk_version
+    defaultConfig {
+        applicationId "com.thinkpalm.test.movieapp"
+        minSdkVersion min_sdk_version
+        targetSdkVersion target_sdk_version
+        versionCode 10001
+        versionName "1.0.0-alpha01"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    buildFeatures {
+        dataBinding true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    // To make `sharedTest` accessible from both unit test and instrumentation test
+    sourceSets {
+        String sharedTestDir = 'src/sharedTest/java'
+        test {
+            java.srcDir sharedTestDir
+        }
+        androidTest {
+            java.srcDir sharedTestDir
+        }
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources true
+            returnDefaultValues true
+        }
+    }
+}
+
+dependencies {
+
+    //Core
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
+    implementation "androidx.core:core-ktx:$ktx_version"
+    implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
+    implementation "com.google.android.material:material:$material_version"
+
+    // Coroutines
+    def coroutines_version = '1.3.5'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
+
+    // Lifecycle extension
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+
+    // Dagger 2
+    def dagger_version = '2.27'
+    implementation "com.google.dagger:dagger:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+
+
+    // MaterialColors
+    implementation 'com.theah64.materialcolors:materialcolors:1.0.0'
+
+    // TwinKill
+    def twinkill_version = '1.1.0-alpha05'
+    implementation "com.theapache64.twinkill:core:$twinkill_version"
+    testImplementation "com.theapache64.twinkill:test:$twinkill_version"
+    androidTestImplementation "com.theapache64.twinkill:test:$twinkill_version"
+    implementation "com.theapache64.twinkill:logger:$twinkill_version"
+
+    // Moshi
+    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
+
+    // Test
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
+    testImplementation "org.mockito:mockito-inline:$mockito_version"
+    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
+    testImplementation('com.winterbe:expekt:0.5.0') {
+        exclude group: "org.jetbrains.kotlin"
+    }
+
+    // Robolectric
+    testImplementation "org.robolectric:robolectric:4.3.1"
+
+    // Mocktio Kotlin
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+    androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+
+    // Arch testing
+    def core_testing_version = '2.1.0'
+    testImplementation "androidx.arch.core:core-testing:$core_testing_version"
+    androidTestImplementation "androidx.arch.core:core-testing:$core_testing_version"
+    testImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+
+    // Espresso
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation('com.schibsted.spain:barista:3.4.0') {
+        exclude group: 'org.jetbrains.kotlin'
+    }
+
+    // DaggerMock
+    testImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
+    androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
+    testImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
+    androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
+}
diff --git a/build.gradle b/build.gradle
index 8325fc2..08de366 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     testImplementation 'com.winterbe:expekt:0.5.0'
 
     // Mockito inline
-    testImplementation 'org.mockito:mockito-inline:3.3.3'
+    testImplementation('org.mockito:mockito-inline:3.3.3')
 
     // Mockito-koltin
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
index df5cd2e..5956523 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
@@ -2,6 +2,7 @@ package com.theapache64.gpm.commands.subcommands
 
 import com.theapache64.gpm.data.repos.GpmRepo
 import com.theapache64.gpm.di.components.DaggerInstallComponent
+import com.theapache64.gpm.core.gm.GradleManager
 import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import java.util.concurrent.Callable
@@ -22,6 +23,9 @@ class Install : Callable<Int> {
     @Inject
     lateinit var gpmRepo: GpmRepo
 
+    @Inject
+    lateinit var gradleParser: GradleManager
+
     init {
         DaggerInstallComponent.create().inject(this)
     }
diff --git a/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt b/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
index b0d7953..4c5002c 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
@@ -1,7 +1,7 @@
 package com.theapache64.gpm.core
 
 import com.theapache64.gpm.core.registries.gpm.GpmRegistry
-import com.theapache64.gpm.models.Dependency
+import com.theapache64.gpm.models.RegistryDependency
 
 object RegistryManager {
 
@@ -12,7 +12,7 @@ object RegistryManager {
     /**
      * To get dependency from the available collectors
      */
-    fun getDependency(name: String): Dependency? {
+    fun getDependency(name: String): RegistryDependency? {
 
         for (depCol in dependencyCollectors) {
             val dependency = depCol.getDependency(name)
diff --git a/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
index 69c898b..62c5b48 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
@@ -1,8 +1,8 @@
 package com.theapache64.gpm.core.base
 
-import com.theapache64.gpm.models.Dependency
+import com.theapache64.gpm.models.RegistryDependency
 
 interface BaseRegistry {
     fun getDependencyUrl(name: String): String
-    fun getDependency(name: String): Dependency?
+    fun getDependency(name: String): RegistryDependency?
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt
new file mode 100644
index 0000000..e101c36
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt
@@ -0,0 +1,25 @@
+package com.theapache64.gpm.core.gm
+
+data class GradleDependency(
+    val type: Type,
+    val groupId: String,
+    val artifactId: String,
+    val version: String
+) {
+    enum class Type(val keyword: String) {
+        IMP("implementation"),
+        TEST_IMP("testImplementation"),
+        AND_TEST_IMP("androidTestImplementation")
+    }
+
+    fun getFullSignature(): String {
+
+        val quote = if (version.startsWith("$")) {
+            "\""
+        } else {
+            "'"
+        }
+
+        return "${type.keyword} $quote$groupId:$artifactId:$version$quote"
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
new file mode 100644
index 0000000..ac867f0
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -0,0 +1,65 @@
+package com.theapache64.gpm.core.gm
+
+import java.io.File
+import java.io.IOException
+import java.lang.IllegalArgumentException
+
+/**
+ * Currently supports 'implementation' and 'testImplementation' only.
+ */
+class GradleManager constructor(
+    private val gradleFile: File
+) {
+
+
+    companion object {
+        private val DEPENDENCY_REGEX by lazy {
+            "(?<type>androidTestImplementation|testImplementation|implementation)\\s*\\(?[\"'](?<groupId>.+?):(?<artifactId>.+?):(?<version>.+?)[\"']\\)?".toRegex()
+        }
+    }
+
+    fun parseDependencies(): List<GradleDependency> {
+        val deps = mutableListOf<GradleDependency>()
+        val fileContent = gradleFile.readText()
+        val matchResults = DEPENDENCY_REGEX.findAll(fileContent)
+
+        for (result in matchResults) {
+
+            val type = result.groups["type"]!!.value
+            val groupId = result.groups["groupId"]!!.value
+            val artifactId = result.groups["artifactId"]!!.value
+            val version = result.groups["version"]!!.value
+
+            val gdType = GradleDependency.Type.values().find { it.keyword == type }
+                ?: throw IllegalArgumentException("Couldn't find dependency type for '$type.'")
+
+            deps.add(
+                GradleDependency(
+                    gdType,
+                    groupId,
+                    artifactId,
+                    version
+                )
+            )
+        }
+
+        return deps
+    }
+
+    /**
+     * To add dependency
+     */
+    fun addDependency(newDep: GradleDependency) {
+        var fileContent = gradleFile.readText()
+        val lastDependency = DEPENDENCY_REGEX.findAll(fileContent).lastOrNull()
+        if (lastDependency != null) {
+            val fullMatch = lastDependency.value
+            val matchPlusNew = "$fullMatch\n    ${newDep.getFullSignature()}"
+            fileContent = fileContent.replace(fullMatch, matchPlusNew)
+            gradleFile.writeText(fileContent)
+        } else {
+            throw IOException("Couldn't add dependency '$newDep'. Unable to find dependency ")
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
index 096df22..7e379e7 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
@@ -1,7 +1,7 @@
 package com.theapache64.gpm.core.registries.gpm
 
 import com.theapache64.gpm.core.base.BaseRegistry
-import com.theapache64.gpm.models.Dependency
+import com.theapache64.gpm.models.RegistryDependency
 import java.net.URLEncoder
 
 object GpmRegistry : BaseRegistry {
@@ -11,7 +11,7 @@ object GpmRegistry : BaseRegistry {
         return "https://raw.githubusercontent.com/theapache64/gpm/master/registry/$nameEnc.json"
     }
 
-    override fun getDependency(name: String): Dependency? {
+    override fun getDependency(name: String): RegistryDependency? {
         val url = getDependencyUrl(name)
 
         return null
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
index 855b797..f5e59d7 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
@@ -1,7 +1,7 @@
 package com.theapache64.gpm.core.registries.maven
 
 import com.theapache64.gpm.core.base.BaseRegistry
-import com.theapache64.gpm.models.Dependency
+import com.theapache64.gpm.models.RegistryDependency
 import java.net.URLEncoder
 
 object MavenRegistry : BaseRegistry {
@@ -11,7 +11,7 @@ object MavenRegistry : BaseRegistry {
         return "https://search.maven.org/solrsearch/select?q=${nameEnc}okhttp&rows=1&wt=json"
     }
 
-    override fun getDependency(name: String): Dependency? {
+    override fun getDependency(name: String): RegistryDependency? {
         TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt
index 1bea98e..42a86f6 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt
@@ -1,6 +1,6 @@
 package com.theapache64.gpm.data.remote
 
-import com.theapache64.gpm.models.Dependency
+import com.theapache64.gpm.models.RegistryDependency
 import retrofit2.http.GET
 import retrofit2.http.Path
 
@@ -9,6 +9,6 @@ interface GpmApiInterface {
     @GET("master/registry/{name}.json")
     suspend fun getDependency(
         @Path("name") repoName: String
-    ): Dependency
+    ): RegistryDependency
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
index 0a5e1af..4ea302d 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
@@ -1,7 +1,7 @@
 package com.theapache64.gpm.data.repos
 
 import com.theapache64.gpm.data.remote.GpmApiInterface
-import com.theapache64.gpm.models.Dependency
+import com.theapache64.gpm.models.RegistryDependency
 import retrofit2.HttpException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,7 +13,7 @@ class GpmRepo @Inject constructor(
     /**
      * To get dependency from GPM github registry
      */
-    suspend fun getDependency(dependencyName: String): Dependency? {
+    suspend fun getDependency(dependencyName: String): RegistryDependency? {
         return try {
             gpmApiInterface.getDependency(dependencyName)
         } catch (e: HttpException) {
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 980b96e..dfe202a 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -1,12 +1,13 @@
 package com.theapache64.gpm.di.components
 
 import com.theapache64.gpm.commands.subcommands.Install
+import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.di.modules.NetworkModule
 import dagger.Component
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [NetworkModule::class])
+@Component(modules = [GradleModule::class, NetworkModule::class])
 interface InstallComponent {
     fun inject(install: Install)
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
new file mode 100644
index 0000000..d8ba9cd
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -0,0 +1,31 @@
+package com.theapache64.gpm.di.modules
+
+import com.theapache64.gpm.utils.GpmConfig
+import com.theapache64.gpm.core.gm.GradleManager
+import dagger.Module
+import dagger.Provides
+import java.io.File
+import javax.inject.Named
+
+@Module
+class GradleModule {
+
+    @Provides
+    @Named("gradle_file")
+    fun gradleFile(): File {
+
+        @Suppress("ConstantConditionIf")
+        val filePath = if (GpmConfig.IS_DEBUG_MODE) {
+            "assets/sample.build.gradle"
+        } else {
+            "app/build.gradle"
+        }
+
+        return File(filePath)
+    }
+
+    @Provides
+    fun provideGradleManager(@Named("gradle_file") gradleFile: File): GradleManager {
+        return GradleManager(gradleFile)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/models/Dependency.kt b/src/main/kotlin/com/theapache64/gpm/models/RegistryDependency.kt
similarity index 94%
rename from src/main/kotlin/com/theapache64/gpm/models/Dependency.kt
rename to src/main/kotlin/com/theapache64/gpm/models/RegistryDependency.kt
index b268929..238f26c 100644
--- a/src/main/kotlin/com/theapache64/gpm/models/Dependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/models/RegistryDependency.kt
@@ -2,7 +2,7 @@ package com.theapache64.gpm.models
 
 import com.squareup.moshi.Json
 
-data class Dependency(
+data class RegistryDependency(
     @Json(name = "default_type")
     val defaultType: String, // implementation
     @Json(name = "dependency_signature")
diff --git a/src/main/kotlin/com/theapache64/gpm/utils/GpmConfig.kt b/src/main/kotlin/com/theapache64/gpm/utils/GpmConfig.kt
new file mode 100644
index 0000000..05f6813
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/utils/GpmConfig.kt
@@ -0,0 +1,5 @@
+package com.theapache64.gpm.utils
+
+object GpmConfig {
+    const val IS_DEBUG_MODE = true
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/core/gm/GradleDependencyTest.kt b/src/test/kotlin/com/theapache64/gpm/core/gm/GradleDependencyTest.kt
new file mode 100644
index 0000000..f7b3ce3
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/core/gm/GradleDependencyTest.kt
@@ -0,0 +1,52 @@
+package com.theapache64.gpm.core.gm
+
+import com.winterbe.expekt.should
+import org.junit.Test
+
+class GradleDependencyTest {
+
+    @Test
+    fun `Full signature for implementation`() {
+
+        val gradleDependency = GradleDependency(
+            GradleDependency.Type.IMP,
+            "com.squareup.okhttp3",
+            "okhttp",
+            "4.6.0"
+        )
+
+        gradleDependency.getFullSignature().should.equal(
+            "implementation 'com.squareup.okhttp3:okhttp:4.6.0'"
+        )
+    }
+
+    @Test
+    fun `Full signature for testImplementation`() {
+
+        val gradleDependency = GradleDependency(
+            GradleDependency.Type.TEST_IMP,
+            "org.mockito",
+            "mockito",
+            "3.3.3"
+        )
+
+        gradleDependency.getFullSignature().should.equal(
+            "testImplementation 'org.mockito:mockito:3.3.3'"
+        )
+    }
+
+    @Test
+    fun `Full signature for androidTestImplementation`() {
+
+        val gradleDependency = GradleDependency(
+            GradleDependency.Type.AND_TEST_IMP,
+            "org.mockito",
+            "mockito",
+            "3.3.3"
+        )
+
+        gradleDependency.getFullSignature().should.equal(
+            "androidTestImplementation 'org.mockito:mockito:3.3.3'"
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
new file mode 100644
index 0000000..8645b54
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -0,0 +1,37 @@
+package com.theapache64.gpm.utils
+
+import com.theapache64.gpm.core.gm.GradleDependency
+import com.theapache64.gpm.core.gm.GradleManager
+import com.winterbe.expekt.should
+import org.junit.Before
+import org.junit.Test
+import java.io.File
+
+class GradleManagerTest {
+
+    private lateinit var gradleManager: GradleManager
+    private val sampleGradleFile = File("assets/sample.build.gradle")
+    private val tempGradleFile = File("assets/build.gradle")
+
+    @Before
+    fun setUp() {
+        tempGradleFile.delete()
+        println(sampleGradleFile.absolutePath)
+        sampleGradleFile.copyTo(tempGradleFile)
+        this.gradleManager = GradleManager(tempGradleFile)
+    }
+
+    @Test
+    fun whenGetDependenciesSize_then10() {
+        gradleManager.parseDependencies().size.should.equal(37)
+        gradleManager.addDependency(
+            GradleDependency(
+                GradleDependency.Type.IMP,
+                "myGroup",
+                "myArtifcat",
+                "myVersion"
+            )
+        )
+        gradleManager.parseDependencies().size.should.equal(38)
+    }
+}
\ No newline at end of file

From 10f6657f8c24a8a31dadf3e073bc719bae2069cc Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Mon, 4 May 2020 02:24:51 +0530
Subject: [PATCH 04/24] =?UTF-8?q?=F0=9F=86=99=20update=20dependency=20mana?=
 =?UTF-8?q?gement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/{build.gradle => temp.build.gradle}    |  2 +-
 registry/okhttp.json                          |  5 +-
 .../gpm/commands/subcommands/Install.kt       | 62 ++++++++++++--
 .../theapache64/gpm/core/RegistryManager.kt   | 27 ------
 .../theapache64/gpm/core/base/BaseRegistry.kt |  5 +-
 .../theapache64/gpm/core/gm/GradleManager.kt  |  2 +-
 .../gpm/core/registries/gpm/GpmRegistry.kt    | 19 -----
 .../core/registries/maven/MavenRegistry.kt    | 17 ----
 .../gpm/data/remote/MavenApiInterface.kt      |  5 --
 .../data/remote/{ => gpm}/GpmApiInterface.kt  |  6 +-
 .../data/remote/gpm/models/GpmDependency.kt   | 20 +++++
 .../data/remote/maven/MavenApiInterface.kt    | 10 +++
 .../maven/models/GetArtifactResponse.kt       | 84 +++++++++++++++++++
 .../gpm/data/repos/BaseDepedencyRepo.kt       |  7 ++
 .../com/theapache64/gpm/data/repos/GpmRepo.kt |  8 +-
 .../theapache64/gpm/data/repos/MavenRepo.kt   | 18 +++-
 .../gpm/di/components/InstallComponent.kt     |  2 +
 .../gpm/di/modules/GradleModule.kt            |  7 +-
 .../gpm/di/modules/NetworkModule.kt           | 11 ++-
 .../gpm/models/RegistryDependency.kt          | 18 ----
 .../gpm/core/RegistryManagerTest.kt           | 13 ---
 .../theapache64/gpm/data/repos/GpmRepoTest.kt | 31 ++++---
 .../gpm/data/repos/MavenRepoTest.kt           | 21 +++++
 .../theapache64/gpm/rules/MyDaggerMockRule.kt |  8 ++
 .../gpm/utils/GradleManagerTest.kt            |  6 +-
 25 files changed, 271 insertions(+), 143 deletions(-)
 rename assets/{build.gradle => temp.build.gradle} (98%)
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/MavenApiInterface.kt
 rename src/main/kotlin/com/theapache64/gpm/data/remote/{ => gpm}/GpmApiInterface.kt (60%)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/GetArtifactResponse.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/repos/BaseDepedencyRepo.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/models/RegistryDependency.kt
 delete mode 100644 src/test/kotlin/com/theapache64/gpm/core/RegistryManagerTest.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt

diff --git a/assets/build.gradle b/assets/temp.build.gradle
similarity index 98%
rename from assets/build.gradle
rename to assets/temp.build.gradle
index 9d76535..6c20b1e 100644
--- a/assets/build.gradle
+++ b/assets/temp.build.gradle
@@ -136,5 +136,5 @@ dependencies {
     androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
     testImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
     androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
-    implementation 'myGroup:myArtifcat:myVersion'
+    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
 }
diff --git a/registry/okhttp.json b/registry/okhttp.json
index dc7f2e2..45647dd 100644
--- a/registry/okhttp.json
+++ b/registry/okhttp.json
@@ -2,7 +2,8 @@
   "name": "OkHttp",
   "github": "square/okhttp",
   "docs": "https://square.github.io/okhttp/",
-  "dependency_signature": "com.squareup.okhttp3:okhttp",
-  "latest_version": "4.6.0",
+  "groupId": "com.squareup.okhttp3",
+  "artifactId": "okhttp",
+  "get_from": "maven",
   "default_type": "implementation"
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
index 5956523..8c42864 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
@@ -1,10 +1,12 @@
 package com.theapache64.gpm.commands.subcommands
 
+import com.theapache64.gpm.core.gm.GradleDependency
 import com.theapache64.gpm.data.repos.GpmRepo
 import com.theapache64.gpm.di.components.DaggerInstallComponent
 import com.theapache64.gpm.core.gm.GradleManager
 import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
+import java.lang.IllegalArgumentException
 import java.util.concurrent.Callable
 import javax.inject.Inject
 
@@ -18,13 +20,14 @@ class Install : Callable<Int> {
     companion object {
         const val RESULT_REPO_FOUND = 200
         const val RESULT_REPO_NOT_FOUND = 404
+        const val RESULT_REPO_DAMAGED = 666
     }
 
     @Inject
     lateinit var gpmRepo: GpmRepo
 
     @Inject
-    lateinit var gradleParser: GradleManager
+    lateinit var gradleManager: GradleManager
 
     init {
         DaggerInstallComponent.create().inject(this)
@@ -34,19 +37,19 @@ class Install : Callable<Int> {
         names = ["-S", "--save"],
         description = ["To install the dependency as 'implementation'"]
     )
-    var isSave: Boolean? = null
+    var isSave: Boolean = false
 
     @CommandLine.Option(
         names = ["-D", "--save-dev"],
         description = ["To install the dependency as 'testImplementation'"]
     )
-    var isSaveDev: Boolean? = null
+    var isSaveDev: Boolean = false
 
     @CommandLine.Option(
         names = ["-DA", "--save-dev-android"],
         description = ["To install the dependency as 'androidTestImplementation'"]
     )
-    var isSaveDevAndroid: Boolean? = null
+    var isSaveDevAndroid: Boolean = false
 
     @CommandLine.Parameters(index = "0", description = ["Dependency name"])
     lateinit var dependencyName: String
@@ -56,13 +59,56 @@ class Install : Callable<Int> {
         dependencyName = dependencyName.trim().toLowerCase()
 
         // first get from
-        val gpmDependency = gpmRepo.getDependency(dependencyName) ?: return@runBlocking RESULT_REPO_NOT_FOUND
+        val gpmDependency = gpmRepo.getDependency(dependencyName)
+            ?: return@runBlocking RESULT_REPO_NOT_FOUND
 
-        // if all save flags are null, then isSave will be enabled
-        if (isSave == null && isSaveDev == null && isSaveDevAndroid == null) {
-            isSave = true
+        val depTypes = mutableListOf<GradleDependency.Type>().apply {
+
+            if (isSave) {
+                add(GradleDependency.Type.IMP)
+            }
+
+            if (isSaveDev) {
+                add(GradleDependency.Type.TEST_IMP)
+            }
+
+            if (isSaveDevAndroid) {
+                add(GradleDependency.Type.AND_TEST_IMP)
+            }
+
+            // Still empty
+            if (isEmpty() && !gpmDependency.defaultType.isNullOrBlank()) {
+                // setting default dependency
+                val depType = GradleDependency.Type.values().find { it.keyword == gpmDependency.defaultType.trim() }
+                    ?: throw IllegalArgumentException("Invalid default type '${gpmDependency.defaultType}'")
+
+                add(depType)
+            }
+
+            // Still Empty?
+            if (isEmpty()) {
+                // adding default
+                add(GradleDependency.Type.IMP)
+            }
         }
 
+        require(depTypes.isNotEmpty()) { "Dependency type can't be empty" }
+
+        // Getting latest version
+
+        // Adding each dependency
+        for (depType in depTypes) {
+            gradleManager.addDependency(
+                GradleDependency(
+                    depType,
+                    gpmDependency.groupId,
+                    gpmDependency.artifactId,
+                    ""
+                )
+            )
+        }
+
+
         RESULT_REPO_FOUND
     }
 
diff --git a/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt b/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
deleted file mode 100644
index 4c5002c..0000000
--- a/src/main/kotlin/com/theapache64/gpm/core/RegistryManager.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.theapache64.gpm.core
-
-import com.theapache64.gpm.core.registries.gpm.GpmRegistry
-import com.theapache64.gpm.models.RegistryDependency
-
-object RegistryManager {
-
-    private val dependencyCollectors = listOf(
-        GpmRegistry
-    )
-
-    /**
-     * To get dependency from the available collectors
-     */
-    fun getDependency(name: String): RegistryDependency? {
-
-        for (depCol in dependencyCollectors) {
-            val dependency = depCol.getDependency(name)
-            if (dependency != null) {
-                return dependency
-            }
-        }
-
-        return null
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
index 62c5b48..c6fff3e 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
@@ -1,8 +1,7 @@
 package com.theapache64.gpm.core.base
 
-import com.theapache64.gpm.models.RegistryDependency
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
 
 interface BaseRegistry {
-    fun getDependencyUrl(name: String): String
-    fun getDependency(name: String): RegistryDependency?
+    fun getDependency(name: String): GpmDependency?
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
index ac867f0..be22ca0 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -1,5 +1,6 @@
 package com.theapache64.gpm.core.gm
 
+import com.theapache64.gpm.utils.GpmConfig
 import java.io.File
 import java.io.IOException
 import java.lang.IllegalArgumentException
@@ -11,7 +12,6 @@ class GradleManager constructor(
     private val gradleFile: File
 ) {
 
-
     companion object {
         private val DEPENDENCY_REGEX by lazy {
             "(?<type>androidTestImplementation|testImplementation|implementation)\\s*\\(?[\"'](?<groupId>.+?):(?<artifactId>.+?):(?<version>.+?)[\"']\\)?".toRegex()
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
deleted file mode 100644
index 7e379e7..0000000
--- a/src/main/kotlin/com/theapache64/gpm/core/registries/gpm/GpmRegistry.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.theapache64.gpm.core.registries.gpm
-
-import com.theapache64.gpm.core.base.BaseRegistry
-import com.theapache64.gpm.models.RegistryDependency
-import java.net.URLEncoder
-
-object GpmRegistry : BaseRegistry {
-
-    override fun getDependencyUrl(name: String): String {
-        val nameEnc = URLEncoder.encode(name, "UTF-8")
-        return "https://raw.githubusercontent.com/theapache64/gpm/master/registry/$nameEnc.json"
-    }
-
-    override fun getDependency(name: String): RegistryDependency? {
-        val url = getDependencyUrl(name)
-
-        return null
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
deleted file mode 100644
index f5e59d7..0000000
--- a/src/main/kotlin/com/theapache64/gpm/core/registries/maven/MavenRegistry.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.theapache64.gpm.core.registries.maven
-
-import com.theapache64.gpm.core.base.BaseRegistry
-import com.theapache64.gpm.models.RegistryDependency
-import java.net.URLEncoder
-
-object MavenRegistry : BaseRegistry {
-
-    override fun getDependencyUrl(name: String): String {
-        val nameEnc = URLEncoder.encode(name, "UTF-8")
-        return "https://search.maven.org/solrsearch/select?q=${nameEnc}okhttp&rows=1&wt=json"
-    }
-
-    override fun getDependency(name: String): RegistryDependency? {
-        TODO("Not yet implemented")
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/MavenApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/MavenApiInterface.kt
deleted file mode 100644
index a8df1eb..0000000
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/MavenApiInterface.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.theapache64.gpm.data.remote
-
-interface MavenApiInterface {
-
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
similarity index 60%
rename from src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt
rename to src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
index 42a86f6..b53d5c9 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/GpmApiInterface.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
@@ -1,6 +1,6 @@
-package com.theapache64.gpm.data.remote
+package com.theapache64.gpm.data.remote.gpm
 
-import com.theapache64.gpm.models.RegistryDependency
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
 import retrofit2.http.GET
 import retrofit2.http.Path
 
@@ -9,6 +9,6 @@ interface GpmApiInterface {
     @GET("master/registry/{name}.json")
     suspend fun getDependency(
         @Path("name") repoName: String
-    ): RegistryDependency
+    ): GpmDependency
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
new file mode 100644
index 0000000..cb8d127
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
@@ -0,0 +1,20 @@
+package com.theapache64.gpm.data.remote.gpm.models
+
+import com.squareup.moshi.Json
+
+data class GpmDependency(
+    @Json(name = "artifactId")
+    val artifactId: String, // okhttp
+    @Json(name = "default_type")
+    val defaultType: String?, // implementation
+    @Json(name = "docs")
+    val docs: String, // https://square.github.io/okhttp/
+    @Json(name = "get_from")
+    val getFrom: String, // maven
+    @Json(name = "github")
+    val github: String, // square/okhttp
+    @Json(name = "groupId")
+    val groupId: String, // com.squareup.okhttp3
+    @Json(name = "name")
+    val name: String // OkHttp
+)
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
new file mode 100644
index 0000000..16a45f2
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
@@ -0,0 +1,10 @@
+package com.theapache64.gpm.data.remote.maven
+
+import com.theapache64.gpm.data.remote.maven.models.GetArtifactResponse
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+interface MavenApiInterface {
+    @GET("select?q=a:\"{artifactName}\"&rows=1&wt=json")
+    suspend fun getArtifact(@Path("{artifactName}") artifactName: String): GetArtifactResponse
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/GetArtifactResponse.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/GetArtifactResponse.kt
new file mode 100644
index 0000000..34bde80
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/GetArtifactResponse.kt
@@ -0,0 +1,84 @@
+package com.theapache64.gpm.data.remote.maven.models
+
+import com.squareup.moshi.Json
+
+
+data class GetArtifactResponse(
+    @Json(name = "response")
+    val response: Response,
+    @Json(name = "responseHeader")
+    val responseHeader: ResponseHeader,
+    @Json(name = "spellcheck")
+    val spellcheck: Spellcheck
+) {
+    data class Response(
+        @Json(name = "docs")
+        val docs: List<Doc>,
+        @Json(name = "numFound")
+        val numFound: Int, // 6
+        @Json(name = "start")
+        val start: Int // 0
+    ) {
+        data class Doc(
+            @Json(name = "a")
+            val a: String, // retrofit
+            @Json(name = "ec")
+            val ec: List<String>,
+            @Json(name = "g")
+            val g: String, // com.squareup.retrofit2
+            @Json(name = "id")
+            val id: String, // com.squareup.retrofit2:retrofit
+            @Json(name = "latestVersion")
+            val latestVersion: String, // 2.8.1
+            @Json(name = "p")
+            val p: String, // jar
+            @Json(name = "repositoryId")
+            val repositoryId: String, // central
+            @Json(name = "text")
+            val text: List<String>,
+            @Json(name = "timestamp")
+            val timestamp: Long, // 1585158234000
+            @Json(name = "versionCount")
+            val versionCount: Int // 20
+        )
+    }
+
+    data class ResponseHeader(
+        @Json(name = "params")
+        val params: Params,
+        @Json(name = "QTime")
+        val qTime: Int, // 0
+        @Json(name = "status")
+        val status: Int // 0
+    ) {
+        data class Params(
+            @Json(name = "core")
+            val core: String,
+            @Json(name = "fl")
+            val fl: String, // id,g,a,latestVersion,p,ec,repositoryId,text,timestamp,versionCount
+            @Json(name = "indent")
+            val indent: String, // off
+            @Json(name = "q")
+            val q: String, // a:"retrofit"
+            @Json(name = "rows")
+            val rows: String, // 1
+            @Json(name = "sort")
+            val sort: String, // score desc,timestamp desc,g asc,a asc
+            @Json(name = "spellcheck")
+            val spellcheck: String, // true
+            @Json(name = "spellcheck.count")
+            val spellcheckCount: String, // 5
+            @Json(name = "start")
+            val start: String,
+            @Json(name = "version")
+            val version: String, // 2.2
+            @Json(name = "wt")
+            val wt: String // json
+        )
+    }
+
+    data class Spellcheck(
+        @Json(name = "suggestions")
+        val suggestions: List<Any>
+    )
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/BaseDepedencyRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/BaseDepedencyRepo.kt
new file mode 100644
index 0000000..2a95583
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/BaseDepedencyRepo.kt
@@ -0,0 +1,7 @@
+package com.theapache64.gpm.data.repos
+
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+
+interface BaseDependencyRepo {
+    suspend fun getDependency(dependencyName: String): GpmDependency?
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
index 4ea302d..50497a2 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
@@ -1,7 +1,7 @@
 package com.theapache64.gpm.data.repos
 
-import com.theapache64.gpm.data.remote.GpmApiInterface
-import com.theapache64.gpm.models.RegistryDependency
+import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
 import retrofit2.HttpException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -9,11 +9,11 @@ import javax.inject.Singleton
 @Singleton
 class GpmRepo @Inject constructor(
     private val gpmApiInterface: GpmApiInterface
-) {
+) : BaseDependencyRepo {
     /**
      * To get dependency from GPM github registry
      */
-    suspend fun getDependency(dependencyName: String): RegistryDependency? {
+    override suspend fun getDependency(dependencyName: String): GpmDependency? {
         return try {
             gpmApiInterface.getDependency(dependencyName)
         } catch (e: HttpException) {
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
index 0c9f5fc..8f6f672 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
@@ -1,8 +1,24 @@
 package com.theapache64.gpm.data.repos
 
+import com.theapache64.gpm.data.remote.maven.MavenApiInterface
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class MavenRepo @Inject constructor() {
+class MavenRepo @Inject constructor(
+    private val mavenApiInterface: MavenApiInterface
+) : BaseDependencyRepo {
+
+    override suspend fun getDependency(dependencyName: String): GpmDependency? {
+        TODO("")
+        /*val result = mavenApiInterface.getArtifact(dependencyName)
+        if (result.response.docs.isNotEmpty()) {
+            // got artifact
+            return GpmDependency(
+
+            )
+        }*/
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index dfe202a..5b3ffda 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -1,6 +1,7 @@
 package com.theapache64.gpm.di.components
 
 import com.theapache64.gpm.commands.subcommands.Install
+import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
 import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.di.modules.NetworkModule
 import dagger.Component
@@ -10,4 +11,5 @@ import javax.inject.Singleton
 @Component(modules = [GradleModule::class, NetworkModule::class])
 interface InstallComponent {
     fun inject(install: Install)
+    fun gpmApiInterface(): GpmApiInterface
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index d8ba9cd..5a9e323 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -14,9 +14,14 @@ class GradleModule {
     @Named("gradle_file")
     fun gradleFile(): File {
 
+
         @Suppress("ConstantConditionIf")
         val filePath = if (GpmConfig.IS_DEBUG_MODE) {
-            "assets/sample.build.gradle"
+            val sampleFile = File("assets/sample.build.gradle")
+            val tempGradleFile = File("assets/temp.build.gradle")
+            tempGradleFile.delete()
+            sampleFile.copyTo(tempGradleFile)
+            tempGradleFile.absolutePath
         } else {
             "app/build.gradle"
         }
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
index ab1452e..da148f9 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
@@ -2,8 +2,8 @@ package com.theapache64.gpm.di.modules
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import com.theapache64.gpm.data.remote.GpmApiInterface
-import com.theapache64.gpm.data.remote.MavenApiInterface
+import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
+import com.theapache64.gpm.data.remote.maven.MavenApiInterface
 import dagger.Module
 import dagger.Provides
 import retrofit2.Retrofit
@@ -45,7 +45,10 @@ class NetworkModule {
 
     @Singleton
     @Provides
-    fun provideMavenApiInterface(retrofit: Retrofit): MavenApiInterface {
-        return retrofit.create(MavenApiInterface::class.java)
+    fun provideMavenApiInterface(retrofitBuilder: Retrofit.Builder): MavenApiInterface {
+        return retrofitBuilder
+            .baseUrl("https://search.maven.org/solrsearch/")
+            .build()
+            .create(MavenApiInterface::class.java)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/models/RegistryDependency.kt b/src/main/kotlin/com/theapache64/gpm/models/RegistryDependency.kt
deleted file mode 100644
index 238f26c..0000000
--- a/src/main/kotlin/com/theapache64/gpm/models/RegistryDependency.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.theapache64.gpm.models
-
-import com.squareup.moshi.Json
-
-data class RegistryDependency(
-    @Json(name = "default_type")
-    val defaultType: String, // implementation
-    @Json(name = "dependency_signature")
-    val dependencySignature: String, // com.squareup.okhttp3:okhttp
-    @Json(name = "docs")
-    val docs: String, // https://square.github.io/okhttp/
-    @Json(name = "github")
-    val github: String, // square/okhttp
-    @Json(name = "latest_version")
-    val latestVersion: String, // 4.6.0
-    @Json(name = "name")
-    val name: String // OkHttp
-)
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/core/RegistryManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/core/RegistryManagerTest.kt
deleted file mode 100644
index b91cee5..0000000
--- a/src/test/kotlin/com/theapache64/gpm/core/RegistryManagerTest.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.theapache64.gpm.core
-
-import com.winterbe.expekt.should
-import org.junit.Assert.*
-import org.junit.Test
-
-class RegistryManagerTest {
-    @Test
-    fun givenValidRepoName_whenGetDependency_thenReturnValidDependency() {
-        val dependency = RegistryManager.getDependency("okhttp")
-        dependency.should.not.`null`
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
index f626544..530b02c 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
@@ -2,16 +2,31 @@ package com.theapache64.gpm.data.repos
 
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import com.theapache64.gpm.data.remote.GpmApiInterface
+import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
+import com.theapache64.gpm.di.components.InstallComponent
+import com.theapache64.gpm.di.modules.NetworkModule
 import com.winterbe.expekt.should
+import it.cosenonjaviste.daggermock.DaggerMock
+import it.cosenonjaviste.daggermock.DaggerMockRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 
 @ExperimentalCoroutinesApi
 class GpmRepoTest {
 
+    private lateinit var gpmApiInterface: GpmApiInterface
+
+    @get:Rule
+    val daggerMockRule = DaggerMock.rule<InstallComponent>(NetworkModule()) {
+        set {
+            gpmApiInterface = it.gpmApiInterface()
+        }
+    }
+
     private val validRepoName = "okhttp"
     private val invalidRepoName = "fgsdfgsdfj"
 
@@ -19,22 +34,16 @@ class GpmRepoTest {
 
     @Before
     fun setUp() = runBlockingTest {
-        val fakeApiInterface: GpmApiInterface = mock()
-
-        whenever(fakeApiInterface.getDependency(validRepoName))
-            .thenReturn(mock())
-
-        whenever(fakeApiInterface.getDependency(invalidRepoName))
-            .thenThrow(RuntimeException())
-
-        gmpRepo = GpmRepo(fakeApiInterface)
+        gmpRepo = GpmRepo(gpmApiInterface)
     }
 
     @Test
-    fun whenValidRepo_thenSuccess() = runBlockingTest {
+    fun whenValidRepo_thenSuccess() = runBlocking {
         gmpRepo.getDependency(validRepoName).should.not.`null`
+        Unit
     }
 
+
     @Test(expected = RuntimeException::class)
     fun whenValidRepo_thenError() = runBlockingTest {
         gmpRepo.getDependency(invalidRepoName).should.not.`null`
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
new file mode 100644
index 0000000..e3e6428
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
@@ -0,0 +1,21 @@
+package com.theapache64.gpm.data.repos
+
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class MavenRepoTest {
+
+    private lateinit var mavenRepo: MavenRepo
+
+
+    @Before
+    fun setUp() {
+        // mavenRepo = MavenRepo()
+    }
+
+    @Test
+    fun `Valid artifact`() {
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
new file mode 100644
index 0000000..1006630
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
@@ -0,0 +1,8 @@
+package com.theapache64.gpm.rules
+
+import com.theapache64.gpm.di.components.InstallComponent
+import it.cosenonjaviste.daggermock.DaggerMockRule
+
+class MyDaggerMockRule : DaggerMockRule<InstallComponent>(InstallComponent::class.java) {
+
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index 8645b54..85ba209 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -11,14 +11,10 @@ class GradleManagerTest {
 
     private lateinit var gradleManager: GradleManager
     private val sampleGradleFile = File("assets/sample.build.gradle")
-    private val tempGradleFile = File("assets/build.gradle")
 
     @Before
     fun setUp() {
-        tempGradleFile.delete()
-        println(sampleGradleFile.absolutePath)
-        sampleGradleFile.copyTo(tempGradleFile)
-        this.gradleManager = GradleManager(tempGradleFile)
+        this.gradleManager = GradleManager(sampleGradleFile)
     }
 
     @Test

From 35ee0b4f7a42065646b92c275c2ade4cf2227d29 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Mon, 4 May 2020 06:21:49 +0530
Subject: [PATCH 05/24] =?UTF-8?q?=F0=9F=9A=9A=20stablize=20maven=20repo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  6 +-
 .../gpm/commands/base/BaseViewModel.kt        |  5 +
 .../gpm/commands/subcommands/Install.kt       | 83 ++--------------
 .../commands/subcommands/InstallViewModel.kt  | 98 +++++++++++++++++++
 .../gpm/data/remote/gpm/GpmApiInterface.kt    |  2 +-
 .../data/remote/maven/MavenApiInterface.kt    | 11 ++-
 .../maven/models/GetArtifactResponse.kt       | 84 ----------------
 .../data/remote/maven/models/SearchResult.kt  | 14 +++
 .../gpm/data/repos/BaseDepedencyRepo.kt       |  7 --
 .../com/theapache64/gpm/data/repos/GpmRepo.kt | 17 ++--
 .../theapache64/gpm/data/repos/MavenRepo.kt   | 52 ++++++++--
 .../gpm/di/components/InstallComponent.kt     | 12 ++-
 .../gpm/di/modules/NetworkModule.kt           | 12 ++-
 .../gpm/di/modules/ViewModelModule.kt         | 21 ++++
 .../com/theapache64/gpm/utils/StringUtils.kt  |  7 ++
 src/test/kotlin/com/theapache64/gpm/Utils.kt  |  9 ++
 ...InstallTest.kt => InstallViewModelTest.kt} |  6 +-
 .../theapache64/gpm/data/repos/GpmRepoTest.kt | 47 +++++----
 .../gpm/data/repos/MavenRepoTest.kt           | 26 ++++-
 .../gpm/rules/MainCoroutineRule.kt            | 31 ++++++
 .../theapache64/gpm/rules/MyDaggerMockRule.kt |  9 +-
 21 files changed, 332 insertions(+), 227 deletions(-)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/commands/base/BaseViewModel.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/GetArtifactResponse.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/SearchResult.kt
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/data/repos/BaseDepedencyRepo.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/modules/ViewModelModule.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/utils/StringUtils.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/Utils.kt
 rename src/test/kotlin/com/theapache64/gpm/commands/subcommands/{InstallTest.kt => InstallViewModelTest.kt} (80%)
 create mode 100644 src/test/kotlin/com/theapache64/gpm/rules/MainCoroutineRule.kt

diff --git a/build.gradle b/build.gradle
index 08de366..a71a398 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.8.1'
     implementation 'com.squareup.retrofit2:converter-moshi:2.8.1'
     implementation 'com.squareup.moshi:moshi-kotlin:1.9.2'
+    implementation 'com.squareup.retrofit2:converter-scalars:2.1.0'
 
 
     // Dagger
@@ -38,7 +39,7 @@ dependencies {
 
     // Coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.5'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.5'
 
     // Junit
     testImplementation group: 'junit', name: 'junit', version: '4.12'
@@ -52,6 +53,9 @@ dependencies {
     // Mockito-koltin
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
 
+    // Apache commons text
+    implementation 'org.apache.commons:commons-text:1.8'
+
     // DaggerMock
     testImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
     testImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/base/BaseViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/base/BaseViewModel.kt
new file mode 100644
index 0000000..17691ae
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/commands/base/BaseViewModel.kt
@@ -0,0 +1,5 @@
+package com.theapache64.gpm.commands.base
+
+abstract class BaseViewModel<T> {
+    abstract suspend fun call(command: T) : Int
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
index 8c42864..5faf92a 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
@@ -1,12 +1,8 @@
 package com.theapache64.gpm.commands.subcommands
 
-import com.theapache64.gpm.core.gm.GradleDependency
-import com.theapache64.gpm.data.repos.GpmRepo
 import com.theapache64.gpm.di.components.DaggerInstallComponent
-import com.theapache64.gpm.core.gm.GradleManager
 import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
-import java.lang.IllegalArgumentException
 import java.util.concurrent.Callable
 import javax.inject.Inject
 
@@ -17,22 +13,6 @@ import javax.inject.Inject
 )
 class Install : Callable<Int> {
 
-    companion object {
-        const val RESULT_REPO_FOUND = 200
-        const val RESULT_REPO_NOT_FOUND = 404
-        const val RESULT_REPO_DAMAGED = 666
-    }
-
-    @Inject
-    lateinit var gpmRepo: GpmRepo
-
-    @Inject
-    lateinit var gradleManager: GradleManager
-
-    init {
-        DaggerInstallComponent.create().inject(this)
-    }
-
     @CommandLine.Option(
         names = ["-S", "--save"],
         description = ["To install the dependency as 'implementation'"]
@@ -54,62 +34,19 @@ class Install : Callable<Int> {
     @CommandLine.Parameters(index = "0", description = ["Dependency name"])
     lateinit var dependencyName: String
 
-    override fun call(): Int = runBlocking {
-
-        dependencyName = dependencyName.trim().toLowerCase()
-
-        // first get from
-        val gpmDependency = gpmRepo.getDependency(dependencyName)
-            ?: return@runBlocking RESULT_REPO_NOT_FOUND
-
-        val depTypes = mutableListOf<GradleDependency.Type>().apply {
-
-            if (isSave) {
-                add(GradleDependency.Type.IMP)
-            }
-
-            if (isSaveDev) {
-                add(GradleDependency.Type.TEST_IMP)
-            }
-
-            if (isSaveDevAndroid) {
-                add(GradleDependency.Type.AND_TEST_IMP)
-            }
-
-            // Still empty
-            if (isEmpty() && !gpmDependency.defaultType.isNullOrBlank()) {
-                // setting default dependency
-                val depType = GradleDependency.Type.values().find { it.keyword == gpmDependency.defaultType.trim() }
-                    ?: throw IllegalArgumentException("Invalid default type '${gpmDependency.defaultType}'")
-
-                add(depType)
-            }
-
-            // Still Empty?
-            if (isEmpty()) {
-                // adding default
-                add(GradleDependency.Type.IMP)
-            }
-        }
-
-        require(depTypes.isNotEmpty()) { "Dependency type can't be empty" }
-
-        // Getting latest version
+    @Inject
+    lateinit var installViewModel: InstallViewModel
 
-        // Adding each dependency
-        for (depType in depTypes) {
-            gradleManager.addDependency(
-                GradleDependency(
-                    depType,
-                    gpmDependency.groupId,
-                    gpmDependency.artifactId,
-                    ""
-                )
-            )
-        }
+    init {
+        DaggerInstallComponent.create().inject(this)
+    }
 
+    override fun call(): Int = runBlocking {
+        installViewModel.call(this@Install)
+    }
 
-        RESULT_REPO_FOUND
+    fun chooseIndex(map: List<String>): Int {
+        TODO("Not yet implemented")
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
new file mode 100644
index 0000000..227806e
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
@@ -0,0 +1,98 @@
+package com.theapache64.gpm.commands.subcommands
+
+import com.theapache64.gpm.commands.base.BaseViewModel
+import com.theapache64.gpm.core.gm.GradleDependency
+import com.theapache64.gpm.core.gm.GradleManager
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.data.remote.maven.models.SearchResult
+import com.theapache64.gpm.data.repos.GpmRepo
+import com.theapache64.gpm.data.repos.MavenRepo
+import javax.inject.Inject
+
+class InstallViewModel @Inject constructor(
+    private val gpmRepo: GpmRepo,
+    private val mavenRepo: MavenRepo,
+    private val gradleManager: GradleManager
+) : BaseViewModel<Install>() {
+
+    companion object {
+        const val RESULT_REPO_FOUND = 200
+        const val RESULT_REPO_NOT_FOUND = 404
+        const val RESULT_REPO_DAMAGED = 666
+    }
+
+
+    override suspend fun call(command: Install): Int {
+
+        val dependencyName = command.dependencyName.trim().toLowerCase()
+
+        // first get from
+        val gpmDependency = getDependency(command, dependencyName)
+            ?: return RESULT_REPO_NOT_FOUND
+
+
+        val depTypes = mutableListOf<GradleDependency.Type>().apply {
+
+            if (command.isSave) {
+                add(GradleDependency.Type.IMP)
+            }
+
+            if (command.isSaveDev) {
+                add(GradleDependency.Type.TEST_IMP)
+            }
+
+            if (command.isSaveDevAndroid) {
+                add(GradleDependency.Type.AND_TEST_IMP)
+            }
+
+            // Still empty
+            if (isEmpty() && !gpmDependency.defaultType.isNullOrBlank()) {
+                // setting default dependency
+                val depType = GradleDependency.Type.values().find { it.keyword == gpmDependency.defaultType.trim() }
+                    ?: throw IllegalArgumentException("Invalid default type '${gpmDependency.defaultType}'")
+
+                add(depType)
+            }
+
+            // Still Empty?
+            if (isEmpty()) {
+                // adding default
+                add(GradleDependency.Type.IMP)
+            }
+        }
+
+        require(depTypes.isNotEmpty()) { "Dependency type can't be empty" }
+
+        // Getting latest version
+
+        // Adding each dependency
+        for (depType in depTypes) {
+            gradleManager.addDependency(
+                GradleDependency(
+                    depType,
+                    gpmDependency.groupId,
+                    gpmDependency.artifactId,
+                    ""
+                )
+            )
+        }
+
+
+        return RESULT_REPO_FOUND
+    }
+
+    private suspend fun getDependency(install: Install, dependencyName: String): GpmDependency? {
+        var gpmDependency = gpmRepo.getDependency(dependencyName)
+
+        /*if (gpmDependency == null) {
+            val mavenDeps = mavenRepo.getDependencies(dependencyName)
+            val depIndex = install.chooseIndex(
+                mavenDeps.map { "${it.groupId}:${it.artifactId}:${it.latestVersion}" }
+            )
+
+        }*/
+
+        return gpmDependency
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
index b53d5c9..936eaf1 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
@@ -6,7 +6,7 @@ import retrofit2.http.Path
 
 interface GpmApiInterface {
 
-    @GET("master/registry/{name}.json")
+    @GET("registry/{name}.json")
     suspend fun getDependency(
         @Path("name") repoName: String
     ): GpmDependency
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
index 16a45f2..223537c 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
@@ -1,10 +1,13 @@
 package com.theapache64.gpm.data.remote.maven
 
-import com.theapache64.gpm.data.remote.maven.models.GetArtifactResponse
 import retrofit2.http.GET
-import retrofit2.http.Path
+import retrofit2.http.Query
 
 interface MavenApiInterface {
-    @GET("select?q=a:\"{artifactName}\"&rows=1&wt=json")
-    suspend fun getArtifact(@Path("{artifactName}") artifactName: String): GetArtifactResponse
+
+    @GET("search")
+    suspend fun search(
+        @Query("q") query: String
+    ): String
+
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/GetArtifactResponse.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/GetArtifactResponse.kt
deleted file mode 100644
index 34bde80..0000000
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/GetArtifactResponse.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.theapache64.gpm.data.remote.maven.models
-
-import com.squareup.moshi.Json
-
-
-data class GetArtifactResponse(
-    @Json(name = "response")
-    val response: Response,
-    @Json(name = "responseHeader")
-    val responseHeader: ResponseHeader,
-    @Json(name = "spellcheck")
-    val spellcheck: Spellcheck
-) {
-    data class Response(
-        @Json(name = "docs")
-        val docs: List<Doc>,
-        @Json(name = "numFound")
-        val numFound: Int, // 6
-        @Json(name = "start")
-        val start: Int // 0
-    ) {
-        data class Doc(
-            @Json(name = "a")
-            val a: String, // retrofit
-            @Json(name = "ec")
-            val ec: List<String>,
-            @Json(name = "g")
-            val g: String, // com.squareup.retrofit2
-            @Json(name = "id")
-            val id: String, // com.squareup.retrofit2:retrofit
-            @Json(name = "latestVersion")
-            val latestVersion: String, // 2.8.1
-            @Json(name = "p")
-            val p: String, // jar
-            @Json(name = "repositoryId")
-            val repositoryId: String, // central
-            @Json(name = "text")
-            val text: List<String>,
-            @Json(name = "timestamp")
-            val timestamp: Long, // 1585158234000
-            @Json(name = "versionCount")
-            val versionCount: Int // 20
-        )
-    }
-
-    data class ResponseHeader(
-        @Json(name = "params")
-        val params: Params,
-        @Json(name = "QTime")
-        val qTime: Int, // 0
-        @Json(name = "status")
-        val status: Int // 0
-    ) {
-        data class Params(
-            @Json(name = "core")
-            val core: String,
-            @Json(name = "fl")
-            val fl: String, // id,g,a,latestVersion,p,ec,repositoryId,text,timestamp,versionCount
-            @Json(name = "indent")
-            val indent: String, // off
-            @Json(name = "q")
-            val q: String, // a:"retrofit"
-            @Json(name = "rows")
-            val rows: String, // 1
-            @Json(name = "sort")
-            val sort: String, // score desc,timestamp desc,g asc,a asc
-            @Json(name = "spellcheck")
-            val spellcheck: String, // true
-            @Json(name = "spellcheck.count")
-            val spellcheckCount: String, // 5
-            @Json(name = "start")
-            val start: String,
-            @Json(name = "version")
-            val version: String, // 2.2
-            @Json(name = "wt")
-            val wt: String // json
-        )
-    }
-
-    data class Spellcheck(
-        @Json(name = "suggestions")
-        val suggestions: List<Any>
-    )
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/SearchResult.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/SearchResult.kt
new file mode 100644
index 0000000..607de17
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/SearchResult.kt
@@ -0,0 +1,14 @@
+package com.theapache64.gpm.data.remote.maven.models
+
+import java.util.*
+
+data class SearchResult(
+    val id: Int,
+    val name: String,
+    val groupId: String,
+    val artifactId: String,
+    val description: String,
+    val usage: Int,
+    val lastRelease: Date
+)
+
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/BaseDepedencyRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/BaseDepedencyRepo.kt
deleted file mode 100644
index 2a95583..0000000
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/BaseDepedencyRepo.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.theapache64.gpm.data.repos
-
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
-
-interface BaseDependencyRepo {
-    suspend fun getDependency(dependencyName: String): GpmDependency?
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
index 50497a2..f290752 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
@@ -2,22 +2,25 @@ package com.theapache64.gpm.data.repos
 
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
 import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import retrofit2.HttpException
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.coroutines.CoroutineContext
 
 @Singleton
 class GpmRepo @Inject constructor(
     private val gpmApiInterface: GpmApiInterface
-) : BaseDependencyRepo {
+) {
+
     /**
      * To get dependency from GPM github registry
      */
-    override suspend fun getDependency(dependencyName: String): GpmDependency? {
-        return try {
-            gpmApiInterface.getDependency(dependencyName)
-        } catch (e: HttpException) {
-            null
-        }
+    suspend fun getDependency(dependencyName: String): GpmDependency? = try {
+        gpmApiInterface.getDependency(dependencyName)
+    } catch (e: HttpException) {
+        null
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
index 8f6f672..269c63d 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
@@ -1,24 +1,58 @@
 package com.theapache64.gpm.data.repos
 
 import com.theapache64.gpm.data.remote.maven.MavenApiInterface
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.data.remote.maven.models.SearchResult
+import com.theapache64.gpm.utils.removeNewLinesAndMultipleSpaces
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.text.StringEscapeUtils
+import java.io.File
+import java.text.SimpleDateFormat
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MavenRepo @Inject constructor(
     private val mavenApiInterface: MavenApiInterface
-) : BaseDependencyRepo {
+) {
+    companion object {
+        private val SEARCH_RESULT_REGEX by lazy {
+            "<div class=\"im\">.+?(?<number>\\d+?)\\. <\\/span><a href=\"\\/artifact\\/(?<groupId>.+?)\\/(?<artifactId>.+?)\">(?<name>.+?)<\\/a>.+?<b>(?<usages>.+?)<\\/b> usages<\\/a>.+?im-description\">(?<description>.+?)<div.+?Last Release on (?<lastRelease>.+?)<\\/div>".toRegex()
+        }
 
-    override suspend fun getDependency(dependencyName: String): GpmDependency? {
-        TODO("")
-        /*val result = mavenApiInterface.getArtifact(dependencyName)
-        if (result.response.docs.isNotEmpty()) {
-            // got artifact
-            return GpmDependency(
+        //Apr 29, 2020
+        private val SEARCH_RESULT_DATE_FORMAT = SimpleDateFormat("MMM dd, yyyy")
+    }
+
+    suspend fun search(dependencyName: String): List<SearchResult> {
+        val htmlResp = mavenApiInterface.search(dependencyName).removeNewLinesAndMultipleSpaces()
+        val matches = SEARCH_RESULT_REGEX.findAll(htmlResp)
+        val searchResults = mutableListOf<SearchResult>()
+        for (match in matches) {
 
+            val (
+                number,
+                groupId,
+                artifactId,
+                name,
+                usages,
+                description,
+                lastRelease
+            ) = match.destructured
+
+            searchResults.add(
+                SearchResult(
+                    number.trim().toInt(),
+                    name.trim(),
+                    groupId.trim(),
+                    artifactId.trim(),
+                    StringEscapeUtils.unescapeHtml4(description.trim()),
+                    usages.trim().replace(",", "").toInt(),
+                    SEARCH_RESULT_DATE_FORMAT.parse(lastRelease.trim())
+                )
             )
-        }*/
+        }
+        return searchResults
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 5b3ffda..c4b915d 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -2,14 +2,22 @@ package com.theapache64.gpm.di.components
 
 import com.theapache64.gpm.commands.subcommands.Install
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
+import com.theapache64.gpm.data.remote.maven.MavenApiInterface
+import com.theapache64.gpm.data.repos.MavenRepo
 import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.di.modules.NetworkModule
+import com.theapache64.gpm.di.modules.ViewModelModule
 import dagger.Component
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [GradleModule::class, NetworkModule::class])
+@Component(modules = [ViewModelModule::class, NetworkModule::class])
 interface InstallComponent {
-    fun inject(install: Install)
+    /*
+     * For testing
+     */
+
     fun gpmApiInterface(): GpmApiInterface
+    fun mavenApiInterface(): MavenApiInterface
+    fun inject(install: Install)
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
index da148f9..6c1bab2 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
@@ -8,6 +8,7 @@ import dagger.Module
 import dagger.Provides
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.converter.scalars.ScalarsConverterFactory
 import javax.inject.Singleton
 
 @Module
@@ -29,16 +30,16 @@ class NetworkModule {
 
     @Singleton
     @Provides
-    fun provideRetrofit(moshi: Moshi): Retrofit.Builder {
+    fun provideRetrofit(): Retrofit.Builder {
         return Retrofit.Builder()
-            .addConverterFactory(MoshiConverterFactory.create(moshi))
     }
 
     @Singleton
     @Provides
-    fun provideGpmApiInterface(retrofitBuilder: Retrofit.Builder): GpmApiInterface {
+    fun provideGpmApiInterface(retrofitBuilder: Retrofit.Builder, moshi: Moshi): GpmApiInterface {
         return retrofitBuilder
-            .baseUrl("https://raw.githubusercontent.com/theapache64/gpm/")
+            .baseUrl("https://raw.githubusercontent.com/theapache64/gpm/dev/")
+            .addConverterFactory(MoshiConverterFactory.create(moshi))
             .build()
             .create(GpmApiInterface::class.java)
     }
@@ -47,7 +48,8 @@ class NetworkModule {
     @Provides
     fun provideMavenApiInterface(retrofitBuilder: Retrofit.Builder): MavenApiInterface {
         return retrofitBuilder
-            .baseUrl("https://search.maven.org/solrsearch/")
+            .baseUrl("https://mvnrepository.com/")
+            .addConverterFactory(ScalarsConverterFactory.create())
             .build()
             .create(MavenApiInterface::class.java)
     }
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/ViewModelModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/ViewModelModule.kt
new file mode 100644
index 0000000..64e9220
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/ViewModelModule.kt
@@ -0,0 +1,21 @@
+package com.theapache64.gpm.di.modules
+
+import com.theapache64.gpm.commands.subcommands.InstallViewModel
+import com.theapache64.gpm.core.gm.GradleManager
+import com.theapache64.gpm.data.repos.GpmRepo
+import com.theapache64.gpm.data.repos.MavenRepo
+import dagger.Module
+import dagger.Provides
+
+@Module(includes = [GradleModule::class])
+class ViewModelModule {
+
+    @Provides
+    fun provideInstallViewModel(
+        gpmRepo: GpmRepo,
+        mavenRepo: MavenRepo,
+        gradleManager: GradleManager
+    ): InstallViewModel {
+        return InstallViewModel(gpmRepo, mavenRepo, gradleManager)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/utils/StringUtils.kt b/src/main/kotlin/com/theapache64/gpm/utils/StringUtils.kt
new file mode 100644
index 0000000..3c561d7
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/utils/StringUtils.kt
@@ -0,0 +1,7 @@
+package com.theapache64.gpm.utils
+
+fun String.removeNewLinesAndMultipleSpaces(): String {
+    return this.replace("\n", "")
+        .replace("\r", "")
+        .replace("\\s{2,}".toRegex(), " ")
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/Utils.kt b/src/test/kotlin/com/theapache64/gpm/Utils.kt
new file mode 100644
index 0000000..81cb6e4
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/Utils.kt
@@ -0,0 +1,9 @@
+package com.theapache64.gpm
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.runBlocking
+
+fun runBlockingUnitTest(block: suspend (scope: CoroutineScope) -> Unit) = runBlocking {
+    block(this)
+    Unit
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModelTest.kt
similarity index 80%
rename from src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
rename to src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModelTest.kt
index 2194640..1901cf8 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModelTest.kt
@@ -8,7 +8,7 @@ import picocli.CommandLine
 import java.io.PrintWriter
 import java.io.StringWriter
 
-class InstallTest {
+class InstallViewModelTest {
 
     private lateinit var cmd: CommandLine
 
@@ -22,12 +22,12 @@ class InstallTest {
     @Test
     fun whenValidRepoInstall_thenSuccess() {
         val exitCode = cmd.execute("install", "okhttp")
-        exitCode.should.equal(Install.RESULT_REPO_FOUND)
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
     }
 
     @Test
     fun whenInvalidRepoInstall_thenError() {
         val exitCode = cmd.execute("install", "ghdfghfgh")
-        exitCode.should.equal(Install.RESULT_REPO_NOT_FOUND)
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_NOT_FOUND)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
index 530b02c..5d846bf 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
@@ -1,16 +1,11 @@
 package com.theapache64.gpm.data.repos
 
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
-import com.theapache64.gpm.di.components.InstallComponent
-import com.theapache64.gpm.di.modules.NetworkModule
+import com.theapache64.gpm.rules.MyDaggerMockRule
+import com.theapache64.gpm.runBlockingUnitTest
 import com.winterbe.expekt.should
-import it.cosenonjaviste.daggermock.DaggerMock
-import it.cosenonjaviste.daggermock.DaggerMockRule
+import it.cosenonjaviste.daggermock.InjectFromComponent
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -18,35 +13,37 @@ import org.junit.Test
 @ExperimentalCoroutinesApi
 class GpmRepoTest {
 
-    private lateinit var gpmApiInterface: GpmApiInterface
-
     @get:Rule
-    val daggerMockRule = DaggerMock.rule<InstallComponent>(NetworkModule()) {
-        set {
-            gpmApiInterface = it.gpmApiInterface()
-        }
-    }
+    val daggerMockRule = MyDaggerMockRule()
 
-    private val validRepoName = "okhttp"
-    private val invalidRepoName = "fgsdfgsdfj"
+    @InjectFromComponent
+    private lateinit var gpmApiInterface: GpmApiInterface
 
     private lateinit var gmpRepo: GpmRepo
 
+
     @Before
-    fun setUp() = runBlockingTest {
+    fun setUp() {
         gmpRepo = GpmRepo(gpmApiInterface)
     }
 
+
     @Test
-    fun whenValidRepo_thenSuccess() = runBlocking {
-        gmpRepo.getDependency(validRepoName).should.not.`null`
-        Unit
+    fun `Valid search`() = runBlockingUnitTest {
+        val dependency = gmpRepo.getDependency("okhttp")
+        dependency.should.not.`null`
+        dependency!!.name.should.equal("OkHttp")
+        dependency.github.should.equal("square/okhttp")
+        dependency.docs.should.equal("https://square.github.io/okhttp/")
+        dependency.groupId.should.equal("com.squareup.okhttp3")
+        dependency.artifactId.should.equal("okhttp")
+        dependency.getFrom.should.equal("maven")
+        dependency.defaultType.should.equal("implementation")
     }
 
-
-    @Test(expected = RuntimeException::class)
-    fun whenValidRepo_thenError() = runBlockingTest {
-        gmpRepo.getDependency(invalidRepoName).should.not.`null`
+    @Test
+    fun `Invalid search`() = runBlockingUnitTest {
+        gmpRepo.getDependency("fghdfghfgh").should.`null`
     }
 
 
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
index e3e6428..35be0e7 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
@@ -1,21 +1,41 @@
 package com.theapache64.gpm.data.repos
 
+import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
+import com.theapache64.gpm.data.remote.maven.MavenApiInterface
+import com.theapache64.gpm.rules.MyDaggerMockRule
+import com.theapache64.gpm.runBlockingUnitTest
+import com.winterbe.expekt.should
+import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
 class MavenRepoTest {
 
-    private lateinit var mavenRepo: MavenRepo
 
+    @get:Rule
+    val daggerMockRule = MyDaggerMockRule()
+
+    @InjectFromComponent
+    private lateinit var mavenApiInterface: MavenApiInterface
+
+    private lateinit var mavenRepo: MavenRepo
 
     @Before
     fun setUp() {
-        // mavenRepo = MavenRepo()
+        mavenRepo = MavenRepo(mavenApiInterface)
     }
 
+
     @Test
-    fun `Valid artifact`() {
+    fun `Valid search`() = runBlockingUnitTest {
+        val dependency = mavenRepo.search("okhttp")
+        dependency.size.should.above(1)
+    }
 
+    @Test
+    fun `Invalid search`() = runBlockingUnitTest {
+        val dependency = mavenRepo.search("dsfgdfgdsf")
+        dependency.size.should.equal(0)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MainCoroutineRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MainCoroutineRule.kt
new file mode 100644
index 0000000..f690646
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MainCoroutineRule.kt
@@ -0,0 +1,31 @@
+package com.theapache64.gpm.rules
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+import kotlinx.coroutines.test.TestCoroutineScope
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
+
+@Suppress("unused")
+@ExperimentalCoroutinesApi
+class MainCoroutineRule(
+    @Suppress("MemberVisibilityCanBePrivate")
+    val dispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()
+) :
+    TestWatcher(),
+    TestCoroutineScope by TestCoroutineScope(dispatcher) {
+
+    override fun starting(description: Description?) {
+        super.starting(description)
+        Dispatchers.setMain(dispatcher)
+    }
+
+    override fun finished(description: Description?) {
+        super.finished(description)
+        Dispatchers.resetMain()
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
index 1006630..7ef5bf2 100644
--- a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
@@ -1,8 +1,11 @@
 package com.theapache64.gpm.rules
 
 import com.theapache64.gpm.di.components.InstallComponent
+import com.theapache64.gpm.di.modules.NetworkModule
+import it.cosenonjaviste.daggermock.DaggerMock
 import it.cosenonjaviste.daggermock.DaggerMockRule
 
-class MyDaggerMockRule : DaggerMockRule<InstallComponent>(InstallComponent::class.java) {
-
-}
\ No newline at end of file
+class MyDaggerMockRule : DaggerMockRule<InstallComponent>(
+    InstallComponent::class.java,
+    NetworkModule()
+)
\ No newline at end of file

From 2ec0b55b0bc08b1b68affc4a54d67948e99fda80 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Mon, 4 May 2020 07:25:56 +0530
Subject: [PATCH 06/24] =?UTF-8?q?=F0=9F=93=88=20fix=20install?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/temp.build.gradle                      |  2 +-
 .../commands/subcommands/InstallViewModel.kt  | 53 ++++++++++++++++---
 .../data/remote/gpm/models/GpmDependency.kt   |  2 +-
 .../data/remote/maven/MavenApiInterface.kt    |  7 +++
 .../data/remote/maven/models/ArtifactInfo.kt  |  7 +++
 .../data/remote/maven/models/SearchResult.kt  |  4 +-
 .../theapache64/gpm/data/repos/MavenRepo.kt   | 18 ++++++-
 .../gpm/di/components/InstallComponent.kt     |  5 +-
 .../gpm/di/modules/GradleModule.kt            |  4 +-
 .../gpm/di/modules/NetworkModule.kt           |  1 -
 .../gpm/data/repos/MavenRepoTest.kt           | 19 +++++--
 .../theapache64/gpm/rules/MyDaggerMockRule.kt |  4 +-
 .../gpm/utils/GradleManagerTest.kt            | 13 ++++-
 13 files changed, 117 insertions(+), 22 deletions(-)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/ArtifactInfo.kt

diff --git a/assets/temp.build.gradle b/assets/temp.build.gradle
index 6c20b1e..9d76535 100644
--- a/assets/temp.build.gradle
+++ b/assets/temp.build.gradle
@@ -136,5 +136,5 @@ dependencies {
     androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
     testImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
     androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'myGroup:myArtifcat:myVersion'
 }
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
index 227806e..05f5cbb 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
@@ -7,6 +7,7 @@ import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
 import com.theapache64.gpm.data.remote.maven.models.SearchResult
 import com.theapache64.gpm.data.repos.GpmRepo
 import com.theapache64.gpm.data.repos.MavenRepo
+import picocli.CommandLine
 import javax.inject.Inject
 
 class InstallViewModel @Inject constructor(
@@ -77,22 +78,60 @@ class InstallViewModel @Inject constructor(
             )
         }
 
-
         return RESULT_REPO_FOUND
     }
 
     private suspend fun getDependency(install: Install, dependencyName: String): GpmDependency? {
         var gpmDependency = gpmRepo.getDependency(dependencyName)
 
-        /*if (gpmDependency == null) {
-            val mavenDeps = mavenRepo.getDependencies(dependencyName)
-            val depIndex = install.chooseIndex(
-                mavenDeps.map { "${it.groupId}:${it.artifactId}:${it.latestVersion}" }
+        if (gpmDependency == null) {
+            // Searching for maven
+            gpmDependency = getFromMaven(install, dependencyName)
+        }
+
+        return gpmDependency
+    }
+
+    private suspend fun getFromMaven(install: Install, dependencyName: String): GpmDependency? {
+
+        val mavenDeps = mavenRepo.search(dependencyName)
+
+        if (mavenDeps.isNotEmpty()) {
+            val mostUsed = mavenDeps.maxBy { it.usage }!!
+            val selDepId = install.chooseIndex(
+                mavenDeps.map {
+                    val text = "${it.groupId}:${it.artifactId}"
+                    if (it == mostUsed) {
+                        // color text
+                        CommandLine.Help.Ansi.AUTO.string("@|bold,green $text|@")
+                    } else {
+                        //normal text
+                        text
+                    }
+                }
             )
+            val selectedMavenDep = mavenDeps[selDepId - 1]
 
-        }*/
+            // Getting last version
+            val artifactInfo = mavenRepo.getLatestVersion(
+                selectedMavenDep.groupId,
+                selectedMavenDep.artifactId
+            )
 
-        return gpmDependency
+            require(artifactInfo != null) { "Failed to artifact information for $selectedMavenDep" }
+
+            return GpmDependency(
+                selectedMavenDep.artifactId,
+                GradleDependency.Type.IMP.keyword,
+                selectedMavenDep.url,
+                artifactInfo.repoName,
+                null,
+                selectedMavenDep.groupId,
+                selectedMavenDep.name
+            )
+        } else {
+            return null
+        }
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
index cb8d127..c27e103 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
@@ -12,7 +12,7 @@ data class GpmDependency(
     @Json(name = "get_from")
     val getFrom: String, // maven
     @Json(name = "github")
-    val github: String, // square/okhttp
+    val github: String?, // square/okhttp
     @Json(name = "groupId")
     val groupId: String, // com.squareup.okhttp3
     @Json(name = "name")
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
index 223537c..a174f58 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/MavenApiInterface.kt
@@ -1,6 +1,7 @@
 package com.theapache64.gpm.data.remote.maven
 
 import retrofit2.http.GET
+import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface MavenApiInterface {
@@ -10,4 +11,10 @@ interface MavenApiInterface {
         @Query("q") query: String
     ): String
 
+    @GET("artifact/{groupId}/{artifactId}")
+    suspend fun getArtifact(
+        @Path("groupId") groupId: String,
+        @Path("artifactId") artifactId: String
+    ): String
+
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/ArtifactInfo.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/ArtifactInfo.kt
new file mode 100644
index 0000000..90fe20c
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/ArtifactInfo.kt
@@ -0,0 +1,7 @@
+package com.theapache64.gpm.data.remote.maven.models
+
+class ArtifactInfo(
+    val version: String,
+    val repoName: String,
+    val repoUrl: String
+)
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/SearchResult.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/SearchResult.kt
index 607de17..095c960 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/SearchResult.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/maven/models/SearchResult.kt
@@ -10,5 +10,7 @@ data class SearchResult(
     val description: String,
     val usage: Int,
     val lastRelease: Date
-)
+) {
+    val url = "https://mvnrepository.com/artifact/$groupId/$artifactId"
+}
 
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
index 269c63d..95c1343 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
@@ -1,9 +1,9 @@
 package com.theapache64.gpm.data.repos
 
 import com.theapache64.gpm.data.remote.maven.MavenApiInterface
+import com.theapache64.gpm.data.remote.maven.models.ArtifactInfo
 import com.theapache64.gpm.data.remote.maven.models.SearchResult
 import com.theapache64.gpm.utils.removeNewLinesAndMultipleSpaces
-import org.apache.commons.lang3.StringUtils
 import org.apache.commons.text.StringEscapeUtils
 import java.io.File
 import java.text.SimpleDateFormat
@@ -19,11 +19,16 @@ class MavenRepo @Inject constructor(
             "<div class=\"im\">.+?(?<number>\\d+?)\\. <\\/span><a href=\"\\/artifact\\/(?<groupId>.+?)\\/(?<artifactId>.+?)\">(?<name>.+?)<\\/a>.+?<b>(?<usages>.+?)<\\/b> usages<\\/a>.+?im-description\">(?<description>.+?)<div.+?Last Release on (?<lastRelease>.+?)<\\/div>".toRegex()
         }
 
+        private val ARTIFACT_VERSION_REGEX by lazy {
+            "<tr>.+?vbtn milestone\">(?<version>.+?)<\\/a><\\/td><td><a class=\"b lic\" href=\"(?<repoUrl>.+?)\">(?<repoName>.+?)<\\/a>".toRegex()
+        }
+
         //Apr 29, 2020
         private val SEARCH_RESULT_DATE_FORMAT = SimpleDateFormat("MMM dd, yyyy")
     }
 
     suspend fun search(dependencyName: String): List<SearchResult> {
+
         val htmlResp = mavenApiInterface.search(dependencyName).removeNewLinesAndMultipleSpaces()
         val matches = SEARCH_RESULT_REGEX.findAll(htmlResp)
         val searchResults = mutableListOf<SearchResult>()
@@ -54,5 +59,16 @@ class MavenRepo @Inject constructor(
         return searchResults
     }
 
+    suspend fun getLatestVersion(groupId: String, artifactId: String): ArtifactInfo? {
+        val htmlResp = mavenApiInterface.getArtifact(groupId, artifactId).removeNewLinesAndMultipleSpaces()
+        val results = ARTIFACT_VERSION_REGEX.find(htmlResp)
+        return if (results != null) {
+            val (version, repoUrl, repoName) = results.destructured
+            ArtifactInfo(version, repoName, repoUrl)
+        } else {
+            null
+        }
+    }
+
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index c4b915d..08226ef 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -8,10 +8,12 @@ import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.di.modules.NetworkModule
 import com.theapache64.gpm.di.modules.ViewModelModule
 import dagger.Component
+import java.io.File
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [ViewModelModule::class, NetworkModule::class])
+@Component(modules = [ViewModelModule::class, NetworkModule::class, GradleModule::class])
 interface InstallComponent {
     /*
      * For testing
@@ -19,5 +21,6 @@ interface InstallComponent {
 
     fun gpmApiInterface(): GpmApiInterface
     fun mavenApiInterface(): MavenApiInterface
+    fun gradleFile(): File
     fun inject(install: Install)
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index 5a9e323..78c0b80 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -11,10 +11,8 @@ import javax.inject.Named
 class GradleModule {
 
     @Provides
-    @Named("gradle_file")
     fun gradleFile(): File {
 
-
         @Suppress("ConstantConditionIf")
         val filePath = if (GpmConfig.IS_DEBUG_MODE) {
             val sampleFile = File("assets/sample.build.gradle")
@@ -30,7 +28,7 @@ class GradleModule {
     }
 
     @Provides
-    fun provideGradleManager(@Named("gradle_file") gradleFile: File): GradleManager {
+    fun provideGradleManager(gradleFile: File): GradleManager {
         return GradleManager(gradleFile)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
index 6c1bab2..05fbaa2 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
@@ -28,7 +28,6 @@ class NetworkModule {
             .build()
     }
 
-    @Singleton
     @Provides
     fun provideRetrofit(): Retrofit.Builder {
         return Retrofit.Builder()
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
index 35be0e7..87d40cf 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
@@ -1,6 +1,5 @@
 package com.theapache64.gpm.data.repos
 
-import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
 import com.theapache64.gpm.data.remote.maven.MavenApiInterface
 import com.theapache64.gpm.rules.MyDaggerMockRule
 import com.theapache64.gpm.runBlockingUnitTest
@@ -9,10 +8,10 @@ import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import retrofit2.HttpException
 
 class MavenRepoTest {
 
-
     @get:Rule
     val daggerMockRule = MyDaggerMockRule()
 
@@ -26,7 +25,6 @@ class MavenRepoTest {
         mavenRepo = MavenRepo(mavenApiInterface)
     }
 
-
     @Test
     fun `Valid search`() = runBlockingUnitTest {
         val dependency = mavenRepo.search("okhttp")
@@ -38,4 +36,19 @@ class MavenRepoTest {
         val dependency = mavenRepo.search("dsfgdfgdsf")
         dependency.size.should.equal(0)
     }
+
+    @Test
+    fun `Getting valid artifact information`() = runBlockingUnitTest {
+        val info = mavenRepo.getLatestVersion("org.junit.jupiter", "junit-jupiter-api")
+        info.should.not.`null`
+        info!!.version.should.equal("5.7.0-M1")
+        info.repoName.should.equal("Central")
+        info.repoUrl.should.equal("/repos/central")
+    }
+
+    @Test(expected = HttpException::class)
+    fun `Getting invalid artifact information`() = runBlockingUnitTest {
+        val info = mavenRepo.getLatestVersion("gfh", "jhj")
+        info.should.`null`
+    }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
index 7ef5bf2..87e5d6b 100644
--- a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
@@ -1,11 +1,13 @@
 package com.theapache64.gpm.rules
 
 import com.theapache64.gpm.di.components.InstallComponent
+import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.di.modules.NetworkModule
 import it.cosenonjaviste.daggermock.DaggerMock
 import it.cosenonjaviste.daggermock.DaggerMockRule
 
 class MyDaggerMockRule : DaggerMockRule<InstallComponent>(
     InstallComponent::class.java,
-    NetworkModule()
+    NetworkModule(),
+    GradleModule()
 )
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index 85ba209..be22279 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -2,15 +2,24 @@ package com.theapache64.gpm.utils
 
 import com.theapache64.gpm.core.gm.GradleDependency
 import com.theapache64.gpm.core.gm.GradleManager
+import com.theapache64.gpm.rules.MyDaggerMockRule
 import com.winterbe.expekt.should
+import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import java.io.File
+import javax.inject.Named
 
 class GradleManagerTest {
 
     private lateinit var gradleManager: GradleManager
-    private val sampleGradleFile = File("assets/sample.build.gradle")
+
+    @get:Rule
+    val daggerRule = MyDaggerMockRule()
+
+    @InjectFromComponent
+    lateinit var sampleGradleFile: File
 
     @Before
     fun setUp() {
@@ -24,7 +33,7 @@ class GradleManagerTest {
             GradleDependency(
                 GradleDependency.Type.IMP,
                 "myGroup",
-                "myArtifcat",
+                "myArtifact",
                 "myVersion"
             )
         )

From 3d24f7d4e6e8247c40286ba0e95de65c0d17dd3a Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Mon, 4 May 2020 08:16:03 +0530
Subject: [PATCH 07/24] =?UTF-8?q?=F0=9F=8C=9F=20add=20install?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 24 ++++---
 assets/temp.build.gradle                      |  1 -
 registry/okhttp.json                          |  4 +-
 .../gpm/commands/subcommands/Install.kt       | 19 ++++-
 .../commands/subcommands/InstallViewModel.kt  |  7 +-
 .../theapache64/gpm/core/base/BaseRegistry.kt |  7 --
 .../data/remote/gpm/models/GpmDependency.kt   |  8 ++-
 .../com/theapache64/gpm/data/repos/GpmRepo.kt | 19 +++--
 .../theapache64/gpm/data/repos/MavenRepo.kt   |  3 +-
 .../gpm/di/components/InstallComponent.kt     |  2 +
 .../com/theapache64/gpm/utils/InputUtils.kt   | 44 ++++++++++++
 .../gpm/commands/subcommands/InstallTest.kt   | 72 +++++++++++++++++++
 .../subcommands/InstallViewModelTest.kt       | 33 ---------
 .../theapache64/gpm/data/repos/GpmRepoTest.kt |  5 +-
 14 files changed, 177 insertions(+), 71 deletions(-)
 delete mode 100644 src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/utils/InputUtils.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
 delete mode 100644 src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModelTest.kt

diff --git a/README.md b/README.md
index b5cb991..4919ff0 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,12 @@
 
 | Command                      | Description                                                  | Implemented | Status  | Milestone      |
 |------------------------------|--------------------------------------------------------------|-------------|---------|----------------|
-| `install`                    | To install the dependency as `implementation`                | ⏳           | Implementing | v1.0.0-alpha01 |
-| `install --save-dev`         | To install the dependency as `testImplementation`            | ❌           | Pending | v1.0.0-alpha01 |
-| `install --save-dev-android` | To install the dependency as `androidTestImplementation`     | ❌           | Pending | v1.0.0-alpha01 |
-| `uninstall`                  | To uninstall the dependency from `implementation`            | ❌           | Pending | v1.0.0-alpha01 |
-| `uninstall dev`              | To uninstall the dependency from `testImplementation`        | ❌           | Pending | v1.0.0-alpha01 |
-| `uninstall dev-android`      | To uninstall the dependency from `androidTestImplementation` | ❌           | Pending | v1.0.0-alpha01 |
+| `install`                    | To install the dependency as `implementation`                | ✅           | Done | v1.0.0-alpha01 |
+| `install --save-dev`         | To install the dependency as `testImplementation`            | ✅           | Done | v1.0.0-alpha01 |
+| `install --save-dev-android` | To install the dependency as `androidTestImplementation`     | ✅           | Done | v1.0.0-alpha01 |
+| `uninstall`                  | To uninstall the dependency from `implementation`            | ⏳           | Implementing | v1.0.0-alpha01 |
+| `uninstall dev`              | To uninstall the dependency from `testImplementation`        | ⏳           | Implementing | v1.0.0-alpha01 |
+| `uninstall dev-android`      | To uninstall the dependency from `androidTestImplementation` | ⏳           | Implementing | v1.0.0-alpha01 |
 | `docs`                       | To open the documentation in default browser                 | ❌           | Pending | v1.0.0-alpha01 |
 | `update`                     | To update the dependency version to latest                   | ❌           | Pending | -              |
 | `list`                       | To list all the dependencies                                 | ❌           | Pending | -              |
@@ -30,13 +30,14 @@
 
 Create an issue with below given JSON model as the comment body. 
 
-```json
+```
 {
   "name": "YOUR REPO NAME", // Required : Depenedency Name
   "github": "GITHUB REPO", // Optional: In format, user/repo 
   "docs": "DOCUMENTATION-URL", // Optional : Can be full URL or file name. For eg. "README.md",
-  "dependency_signature": "DEPENDENCY SIGNATURE", // Required : Dependency signature without version name
-  "latest_version": "4.6.0", // Required: Latest version name
+  "group_id": "LIBRARY GROUP ID", // Required : Eg. "com.squareup.okhttp3"
+  "artifact_id": "ARTIFACT ID", // Required: Eg. okhttp
+  "get_from" : "WHERES YOUR REPO HOSTED", // Required : Possible value are jcenter, mavenCentral, jitpack
   "default_type": "implementation" // Required: Possible values are implementation, testImplementation, androidTestImplementation
 }
 ```
@@ -48,8 +49,9 @@ Create an issue with below given JSON model as the comment body.
   "name": "OkHttp",
   "github": "square/okhttp",
   "docs": "https://square.github.io/okhttp/",
-  "dependency_signature": "com.squareup.okhttp3:okhttp",
-  "latest_version": "4.6.0",
+  "groupId": "com.squareup.okhttp3",
+  "artifactId": "okhttp",
+  "get_from": "jcenter",
   "default_type": "implementation"
 }
 ```
diff --git a/assets/temp.build.gradle b/assets/temp.build.gradle
index 9d76535..7efb625 100644
--- a/assets/temp.build.gradle
+++ b/assets/temp.build.gradle
@@ -136,5 +136,4 @@ dependencies {
     androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
     testImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
     androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
-    implementation 'myGroup:myArtifcat:myVersion'
 }
diff --git a/registry/okhttp.json b/registry/okhttp.json
index 45647dd..5ff9183 100644
--- a/registry/okhttp.json
+++ b/registry/okhttp.json
@@ -2,8 +2,8 @@
   "name": "OkHttp",
   "github": "square/okhttp",
   "docs": "https://square.github.io/okhttp/",
-  "groupId": "com.squareup.okhttp3",
-  "artifactId": "okhttp",
+  "group_id": "com.squareup.okhttp3",
+  "artifact_id": "okhttp",
   "get_from": "maven",
   "default_type": "implementation"
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
index 5faf92a..650e053 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
@@ -1,6 +1,9 @@
 package com.theapache64.gpm.commands.subcommands
 
 import com.theapache64.gpm.di.components.DaggerInstallComponent
+import com.theapache64.gpm.utils.GpmConfig
+import com.theapache64.gpm.utils.InputUtils
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import java.util.concurrent.Callable
@@ -45,8 +48,20 @@ class Install : Callable<Int> {
         installViewModel.call(this@Install)
     }
 
-    fun chooseIndex(map: List<String>): Int {
-        TODO("Not yet implemented")
+    suspend fun chooseIndex(items: List<String>): Int {
+        println("Choose: ")
+        items.forEachIndexed() { index: Int, string: String ->
+            println("${index + 1}) $string")
+        }
+        @Suppress("ConstantConditionIf")
+        return if (GpmConfig.IS_DEBUG_MODE) {
+            delay(1000)
+            val randomInput = (1..items.size).random()
+            println("Random Input: $randomInput")
+            randomInput
+        } else {
+            InputUtils.getInt("Choose one", 1, items.size)
+        }
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
index 05f5cbb..6b942eb 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
@@ -19,10 +19,8 @@ class InstallViewModel @Inject constructor(
     companion object {
         const val RESULT_REPO_FOUND = 200
         const val RESULT_REPO_NOT_FOUND = 404
-        const val RESULT_REPO_DAMAGED = 666
     }
 
-
     override suspend fun call(command: Install): Int {
 
         val dependencyName = command.dependencyName.trim().toLowerCase()
@@ -73,7 +71,7 @@ class InstallViewModel @Inject constructor(
                     depType,
                     gpmDependency.groupId,
                     gpmDependency.artifactId,
-                    ""
+                    gpmDependency.version!!
                 )
             )
         }
@@ -127,7 +125,8 @@ class InstallViewModel @Inject constructor(
                 artifactInfo.repoName,
                 null,
                 selectedMavenDep.groupId,
-                selectedMavenDep.name
+                selectedMavenDep.name,
+                artifactInfo.version
             )
         } else {
             return null
diff --git a/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt b/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
deleted file mode 100644
index c6fff3e..0000000
--- a/src/main/kotlin/com/theapache64/gpm/core/base/BaseRegistry.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.theapache64.gpm.core.base
-
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
-
-interface BaseRegistry {
-    fun getDependency(name: String): GpmDependency?
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
index c27e103..f7d847c 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
@@ -3,7 +3,7 @@ package com.theapache64.gpm.data.remote.gpm.models
 import com.squareup.moshi.Json
 
 data class GpmDependency(
-    @Json(name = "artifactId")
+    @Json(name = "artifact_id")
     val artifactId: String, // okhttp
     @Json(name = "default_type")
     val defaultType: String?, // implementation
@@ -13,8 +13,10 @@ data class GpmDependency(
     val getFrom: String, // maven
     @Json(name = "github")
     val github: String?, // square/okhttp
-    @Json(name = "groupId")
+    @Json(name = "group_id")
     val groupId: String, // com.squareup.okhttp3
     @Json(name = "name")
-    val name: String // OkHttp
+    val name: String,
+    @Transient
+    var version: String? = null // OkHttp
 )
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
index f290752..69fdf27 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
@@ -6,21 +6,28 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import retrofit2.HttpException
+import java.lang.IllegalArgumentException
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.coroutines.CoroutineContext
 
 @Singleton
 class GpmRepo @Inject constructor(
-    private val gpmApiInterface: GpmApiInterface
+    private val gpmApiInterface: GpmApiInterface,
+    private val mavenRepo: MavenRepo
 ) {
 
     /**
      * To get dependency from GPM github registry
      */
-    suspend fun getDependency(dependencyName: String): GpmDependency? = try {
-        gpmApiInterface.getDependency(dependencyName)
-    } catch (e: HttpException) {
-        null
-    }
+    suspend fun getDependency(dependencyName: String): GpmDependency? =
+        try {
+            val dep = gpmApiInterface.getDependency(dependencyName)
+            val versionInfo = mavenRepo.getLatestVersion(dep.groupId, dep.artifactId)
+            require(versionInfo != null) { "Couldn't get version info for '$dependencyName'" }
+            dep.version = versionInfo.version
+            dep
+        } catch (e: HttpException) {
+            null
+        }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
index 95c1343..d094dca 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
@@ -20,7 +20,7 @@ class MavenRepo @Inject constructor(
         }
 
         private val ARTIFACT_VERSION_REGEX by lazy {
-            "<tr>.+?vbtn milestone\">(?<version>.+?)<\\/a><\\/td><td><a class=\"b lic\" href=\"(?<repoUrl>.+?)\">(?<repoName>.+?)<\\/a>".toRegex()
+            "<tr>.+?vbtn release\">(?<version>.+?)<\\/a><\\/td><td><a class=\"b lic\" href=\"(?<repoUrl>.+?)\">(?<repoName>.+?)<\\/a>".toRegex()
         }
 
         //Apr 29, 2020
@@ -61,6 +61,7 @@ class MavenRepo @Inject constructor(
 
     suspend fun getLatestVersion(groupId: String, artifactId: String): ArtifactInfo? {
         val htmlResp = mavenApiInterface.getArtifact(groupId, artifactId).removeNewLinesAndMultipleSpaces()
+        File("x.html").writeText(htmlResp)
         val results = ARTIFACT_VERSION_REGEX.find(htmlResp)
         return if (results != null) {
             val (version, repoUrl, repoName) = results.destructured
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 08226ef..844883a 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -22,5 +22,7 @@ interface InstallComponent {
     fun gpmApiInterface(): GpmApiInterface
     fun mavenApiInterface(): MavenApiInterface
     fun gradleFile(): File
+    fun mavenRepo(): MavenRepo
+
     fun inject(install: Install)
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/utils/InputUtils.kt b/src/main/kotlin/com/theapache64/gpm/utils/InputUtils.kt
new file mode 100644
index 0000000..1c05398
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/utils/InputUtils.kt
@@ -0,0 +1,44 @@
+package com.theapache64.gpm.utils
+
+import java.lang.NumberFormatException
+import java.util.*
+
+/**
+ * Operations related to reading text input from console
+ */
+object InputUtils {
+
+    private val scanner by lazy { Scanner(System.`in`) }
+
+    /**
+     * Get a String with given prompt as prompt
+     */
+    fun getString(prompt: String, isRequired: Boolean): String {
+        print("$prompt: ")
+        val value = scanner.nextLine()
+        while (value.trim().isEmpty() && isRequired) {
+            println("Invalid ${prompt.toLowerCase()} `$value`")
+            return getString(prompt, isRequired)
+        }
+        return value
+    }
+
+    fun getInt(prompt: String, lowerBound: Int, upperBound: Int, but: Array<Int> = arrayOf()): Int {
+        print("$prompt :")
+
+        val sVal = scanner.nextLine()
+        try {
+            val value = sVal.toInt()
+            if (!but.contains(value) && (value < lowerBound || value > upperBound)) {
+                // error
+                println("Input must between $lowerBound and $upperBound")
+                return getInt(prompt, lowerBound, upperBound)
+            }
+            return value
+        } catch (e: NumberFormatException) {
+            println("Invalid input `$sVal`")
+            return getInt(prompt, lowerBound, upperBound)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
new file mode 100644
index 0000000..61ffc54
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -0,0 +1,72 @@
+package com.theapache64.gpm.commands.subcommands
+
+import com.theapache64.gpm.commands.Gpm
+import com.theapache64.gpm.rules.MyDaggerMockRule
+import com.winterbe.expekt.should
+import it.cosenonjaviste.daggermock.InjectFromComponent
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import picocli.CommandLine
+import java.io.File
+import java.io.PrintWriter
+import java.io.StringWriter
+
+class InstallTest {
+
+    private lateinit var cmd: CommandLine
+
+    @get:Rule
+    val daggerRule = MyDaggerMockRule()
+
+    @InjectFromComponent
+    lateinit var tempBuildGradle: File
+
+    @Before
+    fun setUp() {
+        val gpm = Gpm()
+        this.cmd = CommandLine(gpm)
+        cmd.out = PrintWriter(StringWriter())
+    }
+
+    @Test
+    fun `Install default`() {
+        val exitCode = cmd.execute("install", "okhttp")
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        tempBuildGradle.readText().should.contain("implementation 'com.squareup.okhttp3:okhttp:")
+    }
+
+    @Test
+    fun `Install --save`() {
+        val exitCode = cmd.execute("install", "--save", "okhttp")
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        tempBuildGradle.readText().should.contain("implementation 'com.squareup.okhttp3:okhttp:")
+    }
+
+    @Test
+    fun `Install --save-dev`() {
+        val exitCode = cmd.execute("install", "--save-dev", "okhttp")
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        tempBuildGradle.readText().should.contain("testImplementation 'com.squareup.okhttp3:okhttp:")
+    }
+
+    @Test
+    fun `Install --save-dev-android`() {
+        val exitCode = cmd.execute("install", "--save-dev-android", "okhttp")
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        tempBuildGradle.readText().should.contain("androidTestImplementation 'com.squareup.okhttp3:okhttp:")
+    }
+
+    @Test
+    fun `Install not existing library`() {
+        val exitCode = cmd.execute("install", "fghdfghfgh")
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_NOT_FOUND)
+    }
+
+
+    @Test
+    fun whenInvalidRepoInstall_thenError() {
+        val exitCode = cmd.execute("install", "ghdfghfgh")
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_NOT_FOUND)
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModelTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModelTest.kt
deleted file mode 100644
index 1901cf8..0000000
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModelTest.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.theapache64.gpm.commands.subcommands
-
-import com.theapache64.gpm.commands.Gpm
-import com.winterbe.expekt.should
-import org.junit.Before
-import org.junit.Test
-import picocli.CommandLine
-import java.io.PrintWriter
-import java.io.StringWriter
-
-class InstallViewModelTest {
-
-    private lateinit var cmd: CommandLine
-
-    @Before
-    fun setUp() {
-        val gpm = Gpm()
-        this.cmd = CommandLine(gpm)
-        cmd.out = PrintWriter(StringWriter())
-    }
-
-    @Test
-    fun whenValidRepoInstall_thenSuccess() {
-        val exitCode = cmd.execute("install", "okhttp")
-        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
-    }
-
-    @Test
-    fun whenInvalidRepoInstall_thenError() {
-        val exitCode = cmd.execute("install", "ghdfghfgh")
-        exitCode.should.equal(InstallViewModel.RESULT_REPO_NOT_FOUND)
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
index 5d846bf..d691177 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
@@ -19,12 +19,15 @@ class GpmRepoTest {
     @InjectFromComponent
     private lateinit var gpmApiInterface: GpmApiInterface
 
+    @InjectFromComponent
+    private lateinit var mavenRepo: MavenRepo
+
     private lateinit var gmpRepo: GpmRepo
 
 
     @Before
     fun setUp() {
-        gmpRepo = GpmRepo(gpmApiInterface)
+        gmpRepo = GpmRepo(gpmApiInterface, mavenRepo)
     }
 
 

From 49cc776e430704e82bffff00abfd101de6bb0976 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Mon, 4 May 2020 08:20:56 +0530
Subject: [PATCH 08/24] =?UTF-8?q?=F0=9F=93=96=20update=20check=20mark=20em?=
 =?UTF-8?q?oji?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4919ff0..472b17b 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@
 
 | Command                      | Description                                                  | Implemented | Status  | Milestone      |
 |------------------------------|--------------------------------------------------------------|-------------|---------|----------------|
-| `install`                    | To install the dependency as `implementation`                | ✅           | Done | v1.0.0-alpha01 |
-| `install --save-dev`         | To install the dependency as `testImplementation`            | ✅           | Done | v1.0.0-alpha01 |
-| `install --save-dev-android` | To install the dependency as `androidTestImplementation`     | ✅           | Done | v1.0.0-alpha01 |
+| `install`                    | To install the dependency as `implementation`                | ✔️          | Done | v1.0.0-alpha01 |
+| `install --save-dev`         | To install the dependency as `testImplementation`            | ✔️           | Done | v1.0.0-alpha01 |
+| `install --save-dev-android` | To install the dependency as `androidTestImplementation`     | ✔️           | Done | v1.0.0-alpha01 |
 | `uninstall`                  | To uninstall the dependency from `implementation`            | ⏳           | Implementing | v1.0.0-alpha01 |
 | `uninstall dev`              | To uninstall the dependency from `testImplementation`        | ⏳           | Implementing | v1.0.0-alpha01 |
 | `uninstall dev-android`      | To uninstall the dependency from `androidTestImplementation` | ⏳           | Implementing | v1.0.0-alpha01 |

From 74b5a99686d9de3614c1765c4dce47233cb9524f Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Mon, 4 May 2020 09:05:34 +0530
Subject: [PATCH 09/24] .gitignore refreshed

---
 .gitignore                                    |   2 +
 assets/temp.build.gradle                      | 139 ------------------
 .../gpm/commands/subcommands/Install.kt       |   7 +-
 .../theapache64/gpm/data/repos/MavenRepo.kt   |   1 -
 .../gpm/commands/subcommands/InstallTest.kt   |   7 +
 5 files changed, 13 insertions(+), 143 deletions(-)
 delete mode 100644 assets/temp.build.gradle

diff --git a/.gitignore b/.gitignore
index 31cf675..255c9ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,5 @@ gradle-app.setting
 
 # End of https://www.gitignore.io/api/kotlin,intellij,gradle
 SecretConstants.kt
+assets/temp.build.gradle
+x.html
\ No newline at end of file
diff --git a/assets/temp.build.gradle b/assets/temp.build.gradle
deleted file mode 100644
index 7efb625..0000000
--- a/assets/temp.build.gradle
+++ /dev/null
@@ -1,139 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-android-extensions'
-    id "org.jetbrains.kotlin.plugin.allopen" version "$kotlin_version"
-}
-
-allOpen {
-    annotation("com.thinkpalm.test.movieapp.utils.test.OpenForTesting")
-}
-
-android {
-    compileSdkVersion compile_sdk_version
-    defaultConfig {
-        applicationId "com.thinkpalm.test.movieapp"
-        minSdkVersion min_sdk_version
-        targetSdkVersion target_sdk_version
-        versionCode 10001
-        versionName "1.0.0-alpha01"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    buildFeatures {
-        dataBinding true
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    // To make `sharedTest` accessible from both unit test and instrumentation test
-    sourceSets {
-        String sharedTestDir = 'src/sharedTest/java'
-        test {
-            java.srcDir sharedTestDir
-        }
-        androidTest {
-            java.srcDir sharedTestDir
-        }
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources true
-            returnDefaultValues true
-        }
-    }
-}
-
-dependencies {
-
-    //Core
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation "androidx.core:core-ktx:$ktx_version"
-    implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
-    implementation "com.google.android.material:material:$material_version"
-
-    // Coroutines
-    def coroutines_version = '1.3.5'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
-    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
-
-    // Lifecycle extension
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-
-    // Dagger 2
-    def dagger_version = '2.27'
-    implementation "com.google.dagger:dagger:$dagger_version"
-    implementation "com.google.dagger:dagger-android-support:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-
-
-    // MaterialColors
-    implementation 'com.theah64.materialcolors:materialcolors:1.0.0'
-
-    // TwinKill
-    def twinkill_version = '1.1.0-alpha05'
-    implementation "com.theapache64.twinkill:core:$twinkill_version"
-    testImplementation "com.theapache64.twinkill:test:$twinkill_version"
-    androidTestImplementation "com.theapache64.twinkill:test:$twinkill_version"
-    implementation "com.theapache64.twinkill:logger:$twinkill_version"
-
-    // Moshi
-    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
-
-    // Test
-    testImplementation "junit:junit:$junit_version"
-    testImplementation "org.mockito:mockito-core:$mockito_version"
-    testImplementation "org.mockito:mockito-inline:$mockito_version"
-    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
-    testImplementation('com.winterbe:expekt:0.5.0') {
-        exclude group: "org.jetbrains.kotlin"
-    }
-
-    // Robolectric
-    testImplementation "org.robolectric:robolectric:4.3.1"
-
-    // Mocktio Kotlin
-    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
-    androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
-
-    // Arch testing
-    def core_testing_version = '2.1.0'
-    testImplementation "androidx.arch.core:core-testing:$core_testing_version"
-    androidTestImplementation "androidx.arch.core:core-testing:$core_testing_version"
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-
-    // Espresso
-    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
-    androidTestImplementation('com.schibsted.spain:barista:3.4.0') {
-        exclude group: 'org.jetbrains.kotlin'
-    }
-
-    // DaggerMock
-    testImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
-    androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
-    testImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
-    androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock-kotlin:0.8.5'
-}
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
index 650e053..dd38efe 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
@@ -49,16 +49,17 @@ class Install : Callable<Int> {
     }
 
     suspend fun chooseIndex(items: List<String>): Int {
+
         println("Choose: ")
+
         items.forEachIndexed() { index: Int, string: String ->
             println("${index + 1}) $string")
         }
+
         @Suppress("ConstantConditionIf")
         return if (GpmConfig.IS_DEBUG_MODE) {
             delay(1000)
-            val randomInput = (1..items.size).random()
-            println("Random Input: $randomInput")
-            randomInput
+            1
         } else {
             InputUtils.getInt("Choose one", 1, items.size)
         }
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
index d094dca..c36a9c5 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
@@ -61,7 +61,6 @@ class MavenRepo @Inject constructor(
 
     suspend fun getLatestVersion(groupId: String, artifactId: String): ArtifactInfo? {
         val htmlResp = mavenApiInterface.getArtifact(groupId, artifactId).removeNewLinesAndMultipleSpaces()
-        File("x.html").writeText(htmlResp)
         val results = ARTIFACT_VERSION_REGEX.find(htmlResp)
         return if (results != null) {
             val (version, repoUrl, repoName) = results.destructured
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index 61ffc54..d164fa4 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -36,6 +36,13 @@ class InstallTest {
         tempBuildGradle.readText().should.contain("implementation 'com.squareup.okhttp3:okhttp:")
     }
 
+    @Test
+    fun `Install non existing registry`() {
+        val exitCode = cmd.execute("install", "retrofit")
+        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        tempBuildGradle.readText().should.contain("implementation 'com.squareup.retrofit2:retrofit")
+    }
+
     @Test
     fun `Install --save`() {
         val exitCode = cmd.execute("install", "--save", "okhttp")

From 5fccdbe70a1f6ddc783ce00b690330548c84704d Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Tue, 5 May 2020 03:38:29 +0530
Subject: [PATCH 10/24] =?UTF-8?q?=F0=9F=86=99=20update=20add=20dependency?=
 =?UTF-8?q?=20algorithm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commands/subcommands/InstallViewModel.kt  |  3 +-
 .../theapache64/gpm/core/gm/GradleManager.kt  | 46 ++++++++++++++-----
 .../data/remote/gpm/models/GpmDependency.kt   |  2 +
 .../theapache64/gpm/utils/StringExtensions.kt | 14 ++++++
 .../com/theapache64/gpm/utils/StringUtils.kt  | 21 +++++++--
 .../theapache64/gpm/data/repos/GpmRepoTest.kt |  1 -
 .../gpm/utils/GradleManagerTest.kt            |  3 +-
 .../theapache64/gpm/utils/StringUtilsTest.kt  | 22 +++++++++
 8 files changed, 94 insertions(+), 18 deletions(-)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/utils/StringExtensions.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/utils/StringUtilsTest.kt

diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
index 6b942eb..2e8cf47 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
@@ -4,7 +4,6 @@ import com.theapache64.gpm.commands.base.BaseViewModel
 import com.theapache64.gpm.core.gm.GradleDependency
 import com.theapache64.gpm.core.gm.GradleManager
 import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
-import com.theapache64.gpm.data.remote.maven.models.SearchResult
 import com.theapache64.gpm.data.repos.GpmRepo
 import com.theapache64.gpm.data.repos.MavenRepo
 import picocli.CommandLine
@@ -67,6 +66,8 @@ class InstallViewModel @Inject constructor(
         // Adding each dependency
         for (depType in depTypes) {
             gradleManager.addDependency(
+                gpmDependency.name,
+                gpmDependency.description,
                 GradleDependency(
                     depType,
                     gpmDependency.groupId,
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
index be22ca0..6aec094 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -1,8 +1,9 @@
 package com.theapache64.gpm.core.gm
 
-import com.theapache64.gpm.utils.GpmConfig
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.utils.StringUtils
+import com.theapache64.gpm.utils.insertAt
 import java.io.File
-import java.io.IOException
 import java.lang.IllegalArgumentException
 
 /**
@@ -16,6 +17,8 @@ class GradleManager constructor(
         private val DEPENDENCY_REGEX by lazy {
             "(?<type>androidTestImplementation|testImplementation|implementation)\\s*\\(?[\"'](?<groupId>.+?):(?<artifactId>.+?):(?<version>.+?)[\"']\\)?".toRegex()
         }
+
+        private const val KEY_DEPENDENCIES = "dependencies"
     }
 
     fun parseDependencies(): List<GradleDependency> {
@@ -49,16 +52,37 @@ class GradleManager constructor(
     /**
      * To add dependency
      */
-    fun addDependency(newDep: GradleDependency) {
-        var fileContent = gradleFile.readText()
-        val lastDependency = DEPENDENCY_REGEX.findAll(fileContent).lastOrNull()
-        if (lastDependency != null) {
-            val fullMatch = lastDependency.value
-            val matchPlusNew = "$fullMatch\n    ${newDep.getFullSignature()}"
-            fileContent = fileContent.replace(fullMatch, matchPlusNew)
-            gradleFile.writeText(fileContent)
+    @Throws(IndexOutOfBoundsException::class)
+    fun addDependency(name: String, description: String, newDep: GradleDependency) {
+
+        val fileContent = gradleFile.readText()
+
+        if (fileContent.contains(KEY_DEPENDENCIES)) {
+
+            val newDepSign = "\n\t//$name:$description\n\t${newDep.getFullSignature()}\n"
+
+            // Appending dependency
+            val depIndex = fileContent.indexOf(KEY_DEPENDENCIES)
+            val openIndex = fileContent.indexOf('{', depIndex)
+            val closingIndex = StringUtils.getClosingIndexOf(fileContent, '{', openIndex, '}')
+            val newContent = fileContent.insertAt(closingIndex, newDepSign)
+            gradleFile.writeText(newContent)
+
+
         } else {
-            throw IOException("Couldn't add dependency '$newDep'. Unable to find dependency ")
+
+            // Adding first dependency
+            val firstDependency = """
+                
+                // Project Dependencies
+                dependencies {
+                
+                    // $name : $description
+                    ${newDep.getFullSignature()}
+                }
+                
+            """.trimIndent()
+            gradleFile.appendText(firstDependency)
         }
     }
 
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
index f7d847c..997a5f4 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
@@ -17,6 +17,8 @@ data class GpmDependency(
     val groupId: String, // com.squareup.okhttp3
     @Json(name = "name")
     val name: String,
+    @Json(name = "description")
+    val description: String,
     @Transient
     var version: String? = null // OkHttp
 )
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/utils/StringExtensions.kt b/src/main/kotlin/com/theapache64/gpm/utils/StringExtensions.kt
new file mode 100644
index 0000000..bde762d
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/utils/StringExtensions.kt
@@ -0,0 +1,14 @@
+package com.theapache64.gpm.utils
+
+fun String.removeNewLinesAndMultipleSpaces(): String {
+    return this.replace("\n", "")
+        .replace("\r", "")
+        .replace("\\s{2,}".toRegex(), " ")
+}
+
+fun String.insertAt(position: Int, text: String): String {
+    return this.substring(0, position) + text + this.substring(
+        position,
+        this.length
+    )
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/utils/StringUtils.kt b/src/main/kotlin/com/theapache64/gpm/utils/StringUtils.kt
index 3c561d7..19a087f 100644
--- a/src/main/kotlin/com/theapache64/gpm/utils/StringUtils.kt
+++ b/src/main/kotlin/com/theapache64/gpm/utils/StringUtils.kt
@@ -1,7 +1,20 @@
 package com.theapache64.gpm.utils
 
-fun String.removeNewLinesAndMultipleSpaces(): String {
-    return this.replace("\n", "")
-        .replace("\r", "")
-        .replace("\\s{2,}".toRegex(), " ")
+
+object StringUtils {
+
+    fun getClosingIndexOf(text: String, openingChar: Char, openingIndex: Int, closingChar : Char): Int {
+        var closePos: Int = openingIndex
+        var counter = 1
+        while (counter > 0) {
+            val c: Char = text[++closePos]
+            if (c == openingChar) {
+                counter++
+            } else if (c == closingChar) {
+                counter--
+            }
+        }
+        return closePos
+    }
+
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
index d691177..4131a1f 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
@@ -24,7 +24,6 @@ class GpmRepoTest {
 
     private lateinit var gmpRepo: GpmRepo
 
-
     @Before
     fun setUp() {
         gmpRepo = GpmRepo(gpmApiInterface, mavenRepo)
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index be22279..ddd9066 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -9,7 +9,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import java.io.File
-import javax.inject.Named
 
 class GradleManagerTest {
 
@@ -30,6 +29,8 @@ class GradleManagerTest {
     fun whenGetDependenciesSize_then10() {
         gradleManager.parseDependencies().size.should.equal(37)
         gradleManager.addDependency(
+            "My Artifact",
+            "Library for doing some things",
             GradleDependency(
                 GradleDependency.Type.IMP,
                 "myGroup",
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/StringUtilsTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/StringUtilsTest.kt
new file mode 100644
index 0000000..d718eb6
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/utils/StringUtilsTest.kt
@@ -0,0 +1,22 @@
+package com.theapache64.gpm.utils
+
+import com.winterbe.expekt.should
+import org.junit.Test
+
+class StringUtilsTest {
+    @Test
+    fun `Test nested braces`() {
+        val input = """
+            {
+                x 
+                {
+                  y  
+                }
+            }
+        """.trimIndent()
+
+        // open = 13, close = 29
+        val endingIndex = StringUtils.getClosingIndexOf(input, '{', 13, '}')
+        endingIndex.should.equal(2)
+    }
+}
\ No newline at end of file

From 0ec472bb20904ad342ac2cfb552f05504422d737 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Tue, 5 May 2020 04:39:36 +0530
Subject: [PATCH 11/24] =?UTF-8?q?=F0=9F=8C=9F=20add=20gpm=20file=20manager?=
 =?UTF-8?q?=20to=20track=20added=20dependency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  3 +-
 .../commands/subcommands/InstallViewModel.kt  | 10 +---
 .../theapache64/gpm/core/GpmFileManager.kt    | 46 ++++++++++++++++
 .../gpm/core/gm/GradleDependency.kt           | 11 ----
 .../theapache64/gpm/core/gm/GradleManager.kt  | 27 ++++++++--
 .../data/remote/gpm/models/GpmDependency.kt   |  4 +-
 .../gpm/di/components/InstallComponent.kt     |  3 ++
 .../gpm/di/modules/GradleModule.kt            | 13 +++--
 .../theapache64/gpm/di/modules/MoshiModule.kt | 28 ++++++++++
 .../gpm/di/modules/NetworkModule.kt           | 16 +-----
 .../com/theapache64/gpm/models/GpmFileData.kt | 17 ++++++
 .../com/theapache64/gpm/utils/GradleUtils.kt  | 19 +++++++
 .../gpm/core/gm/GradleDependencyTest.kt       | 43 ---------------
 .../gpm/utils/GradleManagerTest.kt            | 23 +++++---
 .../theapache64/gpm/utils/GradleUtilsTest.kt  | 53 +++++++++++++++++++
 15 files changed, 224 insertions(+), 92 deletions(-)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/core/GpmFileManager.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/modules/MoshiModule.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/utils/GradleUtils.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt

diff --git a/.gitignore b/.gitignore
index 255c9ac..a53ca17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,4 +137,5 @@ gradle-app.setting
 # End of https://www.gitignore.io/api/kotlin,intellij,gradle
 SecretConstants.kt
 assets/temp.build.gradle
-x.html
\ No newline at end of file
+x.html
+assets/temp.gpm.json
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
index 2e8cf47..2b5fcda 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
@@ -66,14 +66,8 @@ class InstallViewModel @Inject constructor(
         // Adding each dependency
         for (depType in depTypes) {
             gradleManager.addDependency(
-                gpmDependency.name,
-                gpmDependency.description,
-                GradleDependency(
-                    depType,
-                    gpmDependency.groupId,
-                    gpmDependency.artifactId,
-                    gpmDependency.version!!
-                )
+                depType,
+                gpmDependency
             )
         }
 
diff --git a/src/main/kotlin/com/theapache64/gpm/core/GpmFileManager.kt b/src/main/kotlin/com/theapache64/gpm/core/GpmFileManager.kt
new file mode 100644
index 0000000..e88769b
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/core/GpmFileManager.kt
@@ -0,0 +1,46 @@
+package com.theapache64.gpm.core
+
+import com.squareup.moshi.Moshi
+import com.theapache64.gpm.core.gm.GradleDependency
+import com.theapache64.gpm.core.gm.GradleManager
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.models.GpmFileData
+import com.theapache64.gpm.utils.GpmConfig
+import java.io.File
+
+class GpmFileManager(
+    private val moshi: Moshi
+) {
+    companion object {
+        private val GPM_FILE by lazy {
+            @Suppress("ConstantConditionIf")
+            if (GpmConfig.IS_DEBUG_MODE) {
+                File("assets/temp.gpm.json")
+            } else {
+                File("gpm.json")
+            }
+        }
+    }
+
+    fun add(type: GradleDependency.Type, newGpmDep: GpmDependency) {
+        // Need to login
+        val adapter = moshi.adapter(GpmFileData::class.java).indent(" ")
+        val depToStore = GpmFileData.AddedDep(
+            type.keyword,
+            newGpmDep
+        )
+        val newFileData = if (!GPM_FILE.exists()) {
+            GpmFileData(mutableListOf(depToStore))
+        } else {
+            val gpmFileData = adapter.fromJson(GPM_FILE.readText())
+            gpmFileData!!.deps.add(depToStore)
+            gpmFileData
+        }
+
+
+        val gpmFileDataJson = adapter
+            .toJson(newFileData)
+
+        GPM_FILE.writeText(gpmFileDataJson)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt
index e101c36..9c732f9 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt
@@ -11,15 +11,4 @@ data class GradleDependency(
         TEST_IMP("testImplementation"),
         AND_TEST_IMP("androidTestImplementation")
     }
-
-    fun getFullSignature(): String {
-
-        val quote = if (version.startsWith("$")) {
-            "\""
-        } else {
-            "'"
-        }
-
-        return "${type.keyword} $quote$groupId:$artifactId:$version$quote"
-    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
index 6aec094..f02b41c 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -1,6 +1,11 @@
 package com.theapache64.gpm.core.gm
 
+import com.squareup.moshi.Moshi
+import com.theapache64.gpm.core.GpmFileManager
 import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.models.GpmFileData
+import com.theapache64.gpm.utils.GpmConfig
+import com.theapache64.gpm.utils.GradleUtils
 import com.theapache64.gpm.utils.StringUtils
 import com.theapache64.gpm.utils.insertAt
 import java.io.File
@@ -10,6 +15,7 @@ import java.lang.IllegalArgumentException
  * Currently supports 'implementation' and 'testImplementation' only.
  */
 class GradleManager constructor(
+    private val gpmFileManager: GpmFileManager,
     private val gradleFile: File
 ) {
 
@@ -53,13 +59,26 @@ class GradleManager constructor(
      * To add dependency
      */
     @Throws(IndexOutOfBoundsException::class)
-    fun addDependency(name: String, description: String, newDep: GradleDependency) {
+    fun addDependency(
+        type: GradleDependency.Type,
+        newGpmDep: GpmDependency
+    ) {
 
         val fileContent = gradleFile.readText()
+        val name = newGpmDep.name
+        val description = newGpmDep.description
+
+
+        val fullSignature = GradleUtils.getFullSignature(
+            type.keyword,
+            newGpmDep.groupId,
+            newGpmDep.artifactId,
+            newGpmDep.version!!
+        )
 
         if (fileContent.contains(KEY_DEPENDENCIES)) {
 
-            val newDepSign = "\n\t//$name:$description\n\t${newDep.getFullSignature()}\n"
+            val newDepSign = "\n\t//$name:$description\n\t$fullSignature\n"
 
             // Appending dependency
             val depIndex = fileContent.indexOf(KEY_DEPENDENCIES)
@@ -78,12 +97,14 @@ class GradleManager constructor(
                 dependencies {
                 
                     // $name : $description
-                    ${newDep.getFullSignature()}
+                    $fullSignature
                 }
                 
             """.trimIndent()
             gradleFile.appendText(firstDependency)
         }
+
+        gpmFileManager.add(type, newGpmDep)
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
index 997a5f4..4afe872 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
@@ -21,4 +21,6 @@ data class GpmDependency(
     val description: String,
     @Transient
     var version: String? = null // OkHttp
-)
\ No newline at end of file
+){
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 844883a..0ced9cd 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -1,6 +1,8 @@
 package com.theapache64.gpm.di.components
 
+import com.squareup.moshi.Moshi
 import com.theapache64.gpm.commands.subcommands.Install
+import com.theapache64.gpm.core.GpmFileManager
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
 import com.theapache64.gpm.data.remote.maven.MavenApiInterface
 import com.theapache64.gpm.data.repos.MavenRepo
@@ -23,6 +25,7 @@ interface InstallComponent {
     fun mavenApiInterface(): MavenApiInterface
     fun gradleFile(): File
     fun mavenRepo(): MavenRepo
+    fun gpmFileManager(): GpmFileManager
 
     fun inject(install: Install)
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index 78c0b80..bb6da54 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -1,5 +1,7 @@
 package com.theapache64.gpm.di.modules
 
+import com.squareup.moshi.Moshi
+import com.theapache64.gpm.core.GpmFileManager
 import com.theapache64.gpm.utils.GpmConfig
 import com.theapache64.gpm.core.gm.GradleManager
 import dagger.Module
@@ -7,7 +9,7 @@ import dagger.Provides
 import java.io.File
 import javax.inject.Named
 
-@Module
+@Module(includes = [MoshiModule::class])
 class GradleModule {
 
     @Provides
@@ -28,7 +30,12 @@ class GradleModule {
     }
 
     @Provides
-    fun provideGradleManager(gradleFile: File): GradleManager {
-        return GradleManager(gradleFile)
+    fun provideGpmFileManager(moshi: Moshi): GpmFileManager {
+        return GpmFileManager(moshi)
+    }
+
+    @Provides
+    fun provideGradleManager(gradleFile: File, gpmFileManager: GpmFileManager): GradleManager {
+        return GradleManager(gpmFileManager, gradleFile)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/MoshiModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/MoshiModule.kt
new file mode 100644
index 0000000..f1c22a9
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/MoshiModule.kt
@@ -0,0 +1,28 @@
+package com.theapache64.gpm.di.modules
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+@Module
+class MoshiModule {
+
+    @Singleton
+    @Provides
+    fun provideKotlinJsonAdapterFactory(): KotlinJsonAdapterFactory {
+        return KotlinJsonAdapterFactory()
+    }
+
+
+    @Singleton
+    @Provides
+    fun provideMoshi(kotlinJsonAdapter: KotlinJsonAdapterFactory): Moshi {
+        return Moshi.Builder()
+            .add(kotlinJsonAdapter)
+            .build()
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
index 05fbaa2..8a5182a 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
@@ -11,23 +11,9 @@ import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import javax.inject.Singleton
 
-@Module
+@Module(includes = [MoshiModule::class])
 class NetworkModule {
 
-    @Singleton
-    @Provides
-    fun provideKotlinJsonAdapterFactory(): KotlinJsonAdapterFactory {
-        return KotlinJsonAdapterFactory()
-    }
-
-    @Singleton
-    @Provides
-    fun provideMoshi(kotlinJsonAdapter: KotlinJsonAdapterFactory): Moshi {
-        return Moshi.Builder()
-            .add(kotlinJsonAdapter)
-            .build()
-    }
-
     @Provides
     fun provideRetrofit(): Retrofit.Builder {
         return Retrofit.Builder()
diff --git a/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt b/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
new file mode 100644
index 0000000..db50e4c
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
@@ -0,0 +1,17 @@
+package com.theapache64.gpm.models
+
+import com.squareup.moshi.Json
+import com.theapache64.gpm.core.gm.GradleDependency
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+
+class GpmFileData(
+    @Json(name = "added")
+    val deps: MutableList<AddedDep>
+) {
+    class AddedDep(
+        @Json(name = "type")
+        val type: String,
+        @Json(name = "gpm_dep")
+        val gpmDependency: GpmDependency
+    )
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/utils/GradleUtils.kt b/src/main/kotlin/com/theapache64/gpm/utils/GradleUtils.kt
new file mode 100644
index 0000000..e7766fb
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/utils/GradleUtils.kt
@@ -0,0 +1,19 @@
+package com.theapache64.gpm.utils
+
+object GradleUtils {
+    fun getFullSignature(
+        typeKeyword: String,
+        groupId: String,
+        artifactId: String,
+        version: String
+    ): String {
+
+        val quote = if (version.startsWith("$")) {
+            "\""
+        } else {
+            "'"
+        }
+
+        return "$typeKeyword $quote$groupId:$artifactId:$version$quote"
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/core/gm/GradleDependencyTest.kt b/src/test/kotlin/com/theapache64/gpm/core/gm/GradleDependencyTest.kt
index f7b3ce3..0deb418 100644
--- a/src/test/kotlin/com/theapache64/gpm/core/gm/GradleDependencyTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/core/gm/GradleDependencyTest.kt
@@ -5,48 +5,5 @@ import org.junit.Test
 
 class GradleDependencyTest {
 
-    @Test
-    fun `Full signature for implementation`() {
 
-        val gradleDependency = GradleDependency(
-            GradleDependency.Type.IMP,
-            "com.squareup.okhttp3",
-            "okhttp",
-            "4.6.0"
-        )
-
-        gradleDependency.getFullSignature().should.equal(
-            "implementation 'com.squareup.okhttp3:okhttp:4.6.0'"
-        )
-    }
-
-    @Test
-    fun `Full signature for testImplementation`() {
-
-        val gradleDependency = GradleDependency(
-            GradleDependency.Type.TEST_IMP,
-            "org.mockito",
-            "mockito",
-            "3.3.3"
-        )
-
-        gradleDependency.getFullSignature().should.equal(
-            "testImplementation 'org.mockito:mockito:3.3.3'"
-        )
-    }
-
-    @Test
-    fun `Full signature for androidTestImplementation`() {
-
-        val gradleDependency = GradleDependency(
-            GradleDependency.Type.AND_TEST_IMP,
-            "org.mockito",
-            "mockito",
-            "3.3.3"
-        )
-
-        gradleDependency.getFullSignature().should.equal(
-            "androidTestImplementation 'org.mockito:mockito:3.3.3'"
-        )
-    }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index ddd9066..f94040f 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -1,7 +1,9 @@
 package com.theapache64.gpm.utils
 
+import com.theapache64.gpm.core.GpmFileManager
 import com.theapache64.gpm.core.gm.GradleDependency
 import com.theapache64.gpm.core.gm.GradleManager
+import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
 import com.theapache64.gpm.rules.MyDaggerMockRule
 import com.winterbe.expekt.should
 import it.cosenonjaviste.daggermock.InjectFromComponent
@@ -20,22 +22,29 @@ class GradleManagerTest {
     @InjectFromComponent
     lateinit var sampleGradleFile: File
 
+    @InjectFromComponent
+    lateinit var gpmFileManager: GpmFileManager
+
     @Before
     fun setUp() {
-        this.gradleManager = GradleManager(sampleGradleFile)
+        this.gradleManager = GradleManager(gpmFileManager, sampleGradleFile)
     }
 
     @Test
     fun whenGetDependenciesSize_then10() {
         gradleManager.parseDependencies().size.should.equal(37)
         gradleManager.addDependency(
-            "My Artifact",
-            "Library for doing some things",
-            GradleDependency(
-                GradleDependency.Type.IMP,
-                "myGroup",
+            GradleDependency.Type.IMP,
+            GpmDependency(
                 "myArtifact",
-                "myVersion"
+                GradleDependency.Type.IMP.keyword,
+                "https://mylib.docs",
+                "jcenter",
+                "https://github.com/userx/myArtifact",
+                "myGroup",
+                "My Lib",
+                "Some description",
+                "1.0.0"
             )
         )
         gradleManager.parseDependencies().size.should.equal(38)
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt
new file mode 100644
index 0000000..3ab43b0
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt
@@ -0,0 +1,53 @@
+package com.theapache64.gpm.utils
+
+import com.theapache64.gpm.core.gm.GradleDependency
+import com.winterbe.expekt.should
+import org.junit.Assert.*
+import org.junit.Test
+
+class GradleUtilsTest {
+    @Test
+    fun `Full signature for implementation`() {
+
+        val gradleDependency = GradleUtils.getFullSignature(
+            GradleDependency.Type.IMP.keyword,
+            "org.mockito",
+            "mockito",
+            "3.3.3"
+        )
+
+        gradleDependency.should.equal(
+            "implementation 'org.mockito:mockito:3.3.3'"
+        )
+    }
+
+    @Test
+    fun `Full signature for testImplementation`() {
+
+        val gradleDependency = GradleUtils.getFullSignature(
+            GradleDependency.Type.TEST_IMP.keyword,
+            "org.mockito",
+            "mockito",
+            "3.3.3"
+        )
+
+        gradleDependency.should.equal(
+            "testImplementation 'org.mockito:mockito:3.3.3'"
+        )
+    }
+
+    @Test
+    fun `Full signature for androidTestImplementation`() {
+
+        val gradleDependency = GradleUtils.getFullSignature(
+            GradleDependency.Type.AND_TEST_IMP.keyword,
+            "org.mockito",
+            "mockito",
+            "3.3.3"
+        )
+
+        gradleDependency.should.equal(
+            "androidTestImplementation 'org.mockito:mockito:3.3.3'"
+        )
+    }
+}
\ No newline at end of file

From 4059f6f466cc5d784afb117c404e83d8e244d2a6 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Tue, 5 May 2020 04:40:46 +0530
Subject: [PATCH 12/24] =?UTF-8?q?=F0=9F=9A=9A=20rename=20file=20manager=20?=
 =?UTF-8?q?to=20transaction=20manager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/{GpmFileManager.kt => TransactionManager.kt} |  2 +-
 .../com/theapache64/gpm/core/gm/GradleManager.kt      |  9 +++------
 .../theapache64/gpm/di/components/InstallComponent.kt |  6 ++----
 .../com/theapache64/gpm/di/modules/GradleModule.kt    | 11 +++++------
 .../com/theapache64/gpm/utils/GradleManagerTest.kt    |  6 +++---
 5 files changed, 14 insertions(+), 20 deletions(-)
 rename src/main/kotlin/com/theapache64/gpm/core/{GpmFileManager.kt => TransactionManager.kt} (98%)

diff --git a/src/main/kotlin/com/theapache64/gpm/core/GpmFileManager.kt b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
similarity index 98%
rename from src/main/kotlin/com/theapache64/gpm/core/GpmFileManager.kt
rename to src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
index e88769b..953421f 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/GpmFileManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
@@ -8,7 +8,7 @@ import com.theapache64.gpm.models.GpmFileData
 import com.theapache64.gpm.utils.GpmConfig
 import java.io.File
 
-class GpmFileManager(
+class TransactionManager(
     private val moshi: Moshi
 ) {
     companion object {
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
index f02b41c..b8bd1b5 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -1,10 +1,7 @@
 package com.theapache64.gpm.core.gm
 
-import com.squareup.moshi.Moshi
-import com.theapache64.gpm.core.GpmFileManager
+import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
-import com.theapache64.gpm.models.GpmFileData
-import com.theapache64.gpm.utils.GpmConfig
 import com.theapache64.gpm.utils.GradleUtils
 import com.theapache64.gpm.utils.StringUtils
 import com.theapache64.gpm.utils.insertAt
@@ -15,7 +12,7 @@ import java.lang.IllegalArgumentException
  * Currently supports 'implementation' and 'testImplementation' only.
  */
 class GradleManager constructor(
-    private val gpmFileManager: GpmFileManager,
+    private val transactionManager: TransactionManager,
     private val gradleFile: File
 ) {
 
@@ -104,7 +101,7 @@ class GradleManager constructor(
             gradleFile.appendText(firstDependency)
         }
 
-        gpmFileManager.add(type, newGpmDep)
+        transactionManager.add(type, newGpmDep)
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 0ced9cd..2c6df18 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -1,8 +1,7 @@
 package com.theapache64.gpm.di.components
 
-import com.squareup.moshi.Moshi
 import com.theapache64.gpm.commands.subcommands.Install
-import com.theapache64.gpm.core.GpmFileManager
+import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
 import com.theapache64.gpm.data.remote.maven.MavenApiInterface
 import com.theapache64.gpm.data.repos.MavenRepo
@@ -11,7 +10,6 @@ import com.theapache64.gpm.di.modules.NetworkModule
 import com.theapache64.gpm.di.modules.ViewModelModule
 import dagger.Component
 import java.io.File
-import javax.inject.Named
 import javax.inject.Singleton
 
 @Singleton
@@ -25,7 +23,7 @@ interface InstallComponent {
     fun mavenApiInterface(): MavenApiInterface
     fun gradleFile(): File
     fun mavenRepo(): MavenRepo
-    fun gpmFileManager(): GpmFileManager
+    fun gpmFileManager(): TransactionManager
 
     fun inject(install: Install)
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index bb6da54..f6c0284 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -1,13 +1,12 @@
 package com.theapache64.gpm.di.modules
 
 import com.squareup.moshi.Moshi
-import com.theapache64.gpm.core.GpmFileManager
+import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.utils.GpmConfig
 import com.theapache64.gpm.core.gm.GradleManager
 import dagger.Module
 import dagger.Provides
 import java.io.File
-import javax.inject.Named
 
 @Module(includes = [MoshiModule::class])
 class GradleModule {
@@ -30,12 +29,12 @@ class GradleModule {
     }
 
     @Provides
-    fun provideGpmFileManager(moshi: Moshi): GpmFileManager {
-        return GpmFileManager(moshi)
+    fun provideTransactionManager(moshi: Moshi): TransactionManager {
+        return TransactionManager(moshi)
     }
 
     @Provides
-    fun provideGradleManager(gradleFile: File, gpmFileManager: GpmFileManager): GradleManager {
-        return GradleManager(gpmFileManager, gradleFile)
+    fun provideGradleManager(gradleFile: File, transactionManager: TransactionManager): GradleManager {
+        return GradleManager(transactionManager, gradleFile)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index f94040f..dee8cab 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -1,6 +1,6 @@
 package com.theapache64.gpm.utils
 
-import com.theapache64.gpm.core.GpmFileManager
+import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.core.gm.GradleDependency
 import com.theapache64.gpm.core.gm.GradleManager
 import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
@@ -23,11 +23,11 @@ class GradleManagerTest {
     lateinit var sampleGradleFile: File
 
     @InjectFromComponent
-    lateinit var gpmFileManager: GpmFileManager
+    lateinit var transactionManager: TransactionManager
 
     @Before
     fun setUp() {
-        this.gradleManager = GradleManager(gpmFileManager, sampleGradleFile)
+        this.gradleManager = GradleManager(transactionManager, sampleGradleFile)
     }
 
     @Test

From 156b78d0157e5a4fbe882140667ae050fabf3ca5 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Tue, 5 May 2020 04:46:51 +0530
Subject: [PATCH 13/24] =?UTF-8?q?=E2=97=80=EF=B8=8F=20backup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gpm/di/components/InstallComponent.kt          |  1 -
 .../com/theapache64/gpm/di/modules/GradleModule.kt |  6 +-----
 .../gpm/di/modules/TransactionModule.kt            | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt

diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 2c6df18..fd99b5f 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -18,7 +18,6 @@ interface InstallComponent {
     /*
      * For testing
      */
-
     fun gpmApiInterface(): GpmApiInterface
     fun mavenApiInterface(): MavenApiInterface
     fun gradleFile(): File
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index f6c0284..1e73210 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -8,7 +8,7 @@ import dagger.Module
 import dagger.Provides
 import java.io.File
 
-@Module(includes = [MoshiModule::class])
+@Module(includes = [TransactionModule::class])
 class GradleModule {
 
     @Provides
@@ -28,10 +28,6 @@ class GradleModule {
         return File(filePath)
     }
 
-    @Provides
-    fun provideTransactionManager(moshi: Moshi): TransactionManager {
-        return TransactionManager(moshi)
-    }
 
     @Provides
     fun provideGradleManager(gradleFile: File, transactionManager: TransactionManager): GradleManager {
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
new file mode 100644
index 0000000..5047cb3
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
@@ -0,0 +1,14 @@
+package com.theapache64.gpm.di.modules
+
+import com.squareup.moshi.Moshi
+import com.theapache64.gpm.core.TransactionManager
+import dagger.Module
+import dagger.Provides
+
+@Module(includes = [MoshiModule::class])
+class TransactionModule {
+    @Provides
+    fun provideTransactionManager(moshi: Moshi): TransactionManager {
+        return TransactionManager(moshi)
+    }
+}
\ No newline at end of file

From 1c3125d1fbdb4570dbc79e9c6ad11dad079a4e01 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Tue, 5 May 2020 07:27:16 +0530
Subject: [PATCH 14/24] =?UTF-8?q?=E2=97=80=EF=B8=8F=20update=20registry=20?=
 =?UTF-8?q?structure=20-=20implementing=20uninstall?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 registry/okhttp.json                          |  3 +-
 .../com/theapache64/gpm/commands/Gpm.kt       |  2 +-
 .../subcommands/{ => install}/Install.kt      |  2 +-
 .../{ => install}/InstallViewModel.kt         |  3 +-
 .../subcommands/uninstall/Uninstall.kt        | 48 ++++++++++++++++
 .../uninstall/UninstallViewModel.kt           | 14 +++++
 .../gpm/core/TransactionManager.kt            |  3 +-
 .../theapache64/gpm/core/gm/GradleManager.kt  |  3 +-
 .../gpm/di/components/InstallComponent.kt     |  2 +-
 .../gpm/di/components/UninstallComponent.kt   | 12 ++++
 .../gpm/di/modules/ViewModelModule.kt         |  8 ++-
 .../com/theapache64/gpm/models/GpmFileData.kt |  2 +
 .../gpm/commands/subcommands/InstallTest.kt   |  1 +
 .../subcommands/uninstall/UninstallTest.kt    | 57 +++++++++++++++++++
 .../gpm/utils/GradleManagerTest.kt            |  1 +
 15 files changed, 152 insertions(+), 9 deletions(-)
 rename src/main/kotlin/com/theapache64/gpm/commands/subcommands/{ => install}/Install.kt (96%)
 rename src/main/kotlin/com/theapache64/gpm/commands/subcommands/{ => install}/InstallViewModel.kt (97%)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
 create mode 100644 src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt

diff --git a/registry/okhttp.json b/registry/okhttp.json
index 5ff9183..3f3b280 100644
--- a/registry/okhttp.json
+++ b/registry/okhttp.json
@@ -5,5 +5,6 @@
   "group_id": "com.squareup.okhttp3",
   "artifact_id": "okhttp",
   "get_from": "maven",
-  "default_type": "implementation"
+  "default_type": "implementation",
+  "description": "For networking"
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt b/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
index 1ac32f9..1c4f3d4 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
@@ -1,6 +1,6 @@
 package com.theapache64.gpm.commands
 
-import com.theapache64.gpm.commands.subcommands.Install
+import com.theapache64.gpm.commands.subcommands.install.Install
 import picocli.CommandLine
 
 @CommandLine.Command(
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
similarity index 96%
rename from src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
rename to src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
index dd38efe..78b05d6 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
@@ -1,4 +1,4 @@
-package com.theapache64.gpm.commands.subcommands
+package com.theapache64.gpm.commands.subcommands.install
 
 import com.theapache64.gpm.di.components.DaggerInstallComponent
 import com.theapache64.gpm.utils.GpmConfig
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
similarity index 97%
rename from src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
rename to src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
index 2b5fcda..29ca3f1 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/InstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
@@ -1,4 +1,4 @@
-package com.theapache64.gpm.commands.subcommands
+package com.theapache64.gpm.commands.subcommands.install
 
 import com.theapache64.gpm.commands.base.BaseViewModel
 import com.theapache64.gpm.core.gm.GradleDependency
@@ -66,6 +66,7 @@ class InstallViewModel @Inject constructor(
         // Adding each dependency
         for (depType in depTypes) {
             gradleManager.addDependency(
+                dependencyName,
                 depType,
                 gpmDependency
             )
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
new file mode 100644
index 0000000..9a33766
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
@@ -0,0 +1,48 @@
+package com.theapache64.gpm.commands.subcommands.uninstall
+
+import com.theapache64.gpm.di.components.DaggerUninstallComponent
+import com.theapache64.gpm.di.components.UninstallComponent
+import kotlinx.coroutines.runBlocking
+import picocli.CommandLine
+import java.util.concurrent.Callable
+import javax.inject.Inject
+
+@CommandLine.Command(
+    name = "uninstall",
+    aliases = ["u"],
+    description = ["To uninstall a dependency"]
+)
+class Uninstall : Callable<Int> {
+
+    @CommandLine.Option(
+        names = ["-S", "--save"],
+        description = ["To uninstall the dependency defined as 'implementation'"]
+    )
+    var isSave: Boolean = false
+
+    @CommandLine.Option(
+        names = ["-D", "--save-dev"],
+        description = ["To uninstall the dependency defined as 'testImplementation'"]
+    )
+    var isSaveDev: Boolean = false
+
+    @CommandLine.Option(
+        names = ["-DA", "--save-dev-android"],
+        description = ["To uninstall the dependency defined as 'androidTestImplementation'"]
+    )
+    var isSaveDevAndroid: Boolean = false
+
+    @CommandLine.Parameters(index = "0", description = ["Dependency name"])
+    lateinit var dependencyName: String
+
+    @Inject
+    lateinit var uninstallViewModel: UninstallViewModel
+
+    init {
+        DaggerUninstallComponent.create().inject(this)
+    }
+
+    override fun call(): Int = runBlocking {
+        uninstallViewModel.call(this@Uninstall)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
new file mode 100644
index 0000000..2b090a8
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
@@ -0,0 +1,14 @@
+package com.theapache64.gpm.commands.subcommands.uninstall
+
+import com.theapache64.gpm.commands.base.BaseViewModel
+import javax.inject.Inject
+
+class UninstallViewModel @Inject constructor(
+
+) : BaseViewModel<Uninstall>() {
+
+    override suspend fun call(command: Uninstall): Int {
+        TODO("Not yet implemented")
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
index 953421f..fd541a7 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
@@ -22,11 +22,12 @@ class TransactionManager(
         }
     }
 
-    fun add(type: GradleDependency.Type, newGpmDep: GpmDependency) {
+    fun add(installedName: String, type: GradleDependency.Type, newGpmDep: GpmDependency) {
         // Need to login
         val adapter = moshi.adapter(GpmFileData::class.java).indent(" ")
         val depToStore = GpmFileData.AddedDep(
             type.keyword,
+            installedName,
             newGpmDep
         )
         val newFileData = if (!GPM_FILE.exists()) {
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
index b8bd1b5..6f8b51d 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -57,6 +57,7 @@ class GradleManager constructor(
      */
     @Throws(IndexOutOfBoundsException::class)
     fun addDependency(
+        installedName: String,
         type: GradleDependency.Type,
         newGpmDep: GpmDependency
     ) {
@@ -101,7 +102,7 @@ class GradleManager constructor(
             gradleFile.appendText(firstDependency)
         }
 
-        transactionManager.add(type, newGpmDep)
+        transactionManager.add(installedName, type, newGpmDep)
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index fd99b5f..d88c75b 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -1,6 +1,6 @@
 package com.theapache64.gpm.di.components
 
-import com.theapache64.gpm.commands.subcommands.Install
+import com.theapache64.gpm.commands.subcommands.install.Install
 import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
 import com.theapache64.gpm.data.remote.maven.MavenApiInterface
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
new file mode 100644
index 0000000..f02a153
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
@@ -0,0 +1,12 @@
+package com.theapache64.gpm.di.components
+
+import com.theapache64.gpm.commands.subcommands.uninstall.Uninstall
+import com.theapache64.gpm.di.modules.ViewModelModule
+import dagger.Component
+
+@Component(
+    modules = [ViewModelModule::class]
+)
+interface UninstallComponent {
+    fun inject(uninstall: Uninstall)
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/ViewModelModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/ViewModelModule.kt
index 64e9220..619ae95 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/ViewModelModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/ViewModelModule.kt
@@ -1,6 +1,6 @@
 package com.theapache64.gpm.di.modules
 
-import com.theapache64.gpm.commands.subcommands.InstallViewModel
+import com.theapache64.gpm.commands.subcommands.install.InstallViewModel
 import com.theapache64.gpm.core.gm.GradleManager
 import com.theapache64.gpm.data.repos.GpmRepo
 import com.theapache64.gpm.data.repos.MavenRepo
@@ -16,6 +16,10 @@ class ViewModelModule {
         mavenRepo: MavenRepo,
         gradleManager: GradleManager
     ): InstallViewModel {
-        return InstallViewModel(gpmRepo, mavenRepo, gradleManager)
+        return InstallViewModel(
+            gpmRepo,
+            mavenRepo,
+            gradleManager
+        )
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt b/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
index db50e4c..75c0d35 100644
--- a/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
+++ b/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
@@ -11,6 +11,8 @@ class GpmFileData(
     class AddedDep(
         @Json(name = "type")
         val type: String,
+        @Json(name = "installed_name")
+        val installedName: String,
         @Json(name = "gpm_dep")
         val gpmDependency: GpmDependency
     )
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index d164fa4..1ba3b6b 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -1,6 +1,7 @@
 package com.theapache64.gpm.commands.subcommands
 
 import com.theapache64.gpm.commands.Gpm
+import com.theapache64.gpm.commands.subcommands.install.InstallViewModel
 import com.theapache64.gpm.rules.MyDaggerMockRule
 import com.winterbe.expekt.should
 import it.cosenonjaviste.daggermock.InjectFromComponent
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
new file mode 100644
index 0000000..c67dbf1
--- /dev/null
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
@@ -0,0 +1,57 @@
+package com.theapache64.gpm.commands.subcommands.uninstall
+
+import com.theapache64.gpm.commands.Gpm
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import picocli.CommandLine
+import java.io.PrintWriter
+import java.io.StringWriter
+
+class UninstallTest {
+
+    private lateinit var cmd: CommandLine
+
+    @Before
+    fun setUp() {
+        this.cmd = CommandLine(Gpm()).apply {
+            out = PrintWriter(StringWriter())
+        }
+    }
+
+    @Test
+    fun `Uninstall installed dependency`() {
+        // Install dependency
+        val installExitCode = cmd.execute("install", "okhttp")
+    }
+
+    @Test
+    fun `Uninstall dependency which is manually added`() {
+
+    }
+
+    @Test
+    fun `Uninstall not installed dependency`() {
+
+    }
+
+    @Test
+    fun `Uninstall dependency which installed through same dependency name`() {
+
+    }
+
+    @Test
+    fun `Uninstall testImplementation`() {
+
+    }
+
+    @Test
+    fun `Uninstall androidTestImplementation`() {
+
+    }
+
+    @Test
+    fun `Uninstall modified dependency`() {
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index dee8cab..a016e9a 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -34,6 +34,7 @@ class GradleManagerTest {
     fun whenGetDependenciesSize_then10() {
         gradleManager.parseDependencies().size.should.equal(37)
         gradleManager.addDependency(
+            "my-artifact",
             GradleDependency.Type.IMP,
             GpmDependency(
                 "myArtifact",

From 0fe8f830d7c62ae93cb5cd2fee94a2dad046e89c Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Tue, 5 May 2020 07:38:05 +0530
Subject: [PATCH 15/24] =?UTF-8?q?=F0=9F=9A=9A=20dependency=20to=20dep=20-?=
 =?UTF-8?q?=20refactor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commands/subcommands/install/Install.kt   |  2 +-
 .../subcommands/install/InstallViewModel.kt   | 68 +++++++++----------
 .../subcommands/uninstall/Uninstall.kt        |  2 +-
 .../gpm/core/TransactionManager.kt            |  7 +-
 .../gm/{GradleDependency.kt => GradleDep.kt}  |  2 +-
 .../theapache64/gpm/core/gm/GradleManager.kt  | 30 ++++----
 .../gpm/data/remote/gpm/GpmApiInterface.kt    |  4 +-
 .../models/{GpmDependency.kt => GpmDep.kt}    |  2 +-
 .../com/theapache64/gpm/data/repos/GpmRepo.kt | 13 ++--
 .../theapache64/gpm/data/repos/MavenRepo.kt   |  5 +-
 .../com/theapache64/gpm/models/GpmFileData.kt |  5 +-
 .../gpm/commands/subcommands/InstallTest.kt   | 10 +--
 .../subcommands/uninstall/UninstallTest.kt    |  4 +-
 .../theapache64/gpm/data/repos/GpmRepoTest.kt | 20 +++---
 .../gpm/data/repos/MavenRepoTest.kt           |  8 +--
 .../gpm/utils/GradleManagerTest.kt            | 16 ++---
 .../theapache64/gpm/utils/GradleUtilsTest.kt  |  9 ++-
 17 files changed, 100 insertions(+), 107 deletions(-)
 rename src/main/kotlin/com/theapache64/gpm/core/gm/{GradleDependency.kt => GradleDep.kt} (91%)
 rename src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/{GpmDependency.kt => GpmDep.kt} (96%)

diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
index 78b05d6..7fbcba1 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
@@ -35,7 +35,7 @@ class Install : Callable<Int> {
     var isSaveDevAndroid: Boolean = false
 
     @CommandLine.Parameters(index = "0", description = ["Dependency name"])
-    lateinit var dependencyName: String
+    lateinit var depName: String
 
     @Inject
     lateinit var installViewModel: InstallViewModel
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
index 29ca3f1..8e7ac61 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
@@ -1,9 +1,9 @@
 package com.theapache64.gpm.commands.subcommands.install
 
 import com.theapache64.gpm.commands.base.BaseViewModel
-import com.theapache64.gpm.core.gm.GradleDependency
+import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.core.gm.GradleManager
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import com.theapache64.gpm.data.repos.GpmRepo
 import com.theapache64.gpm.data.repos.MavenRepo
 import picocli.CommandLine
@@ -16,38 +16,38 @@ class InstallViewModel @Inject constructor(
 ) : BaseViewModel<Install>() {
 
     companion object {
-        const val RESULT_REPO_FOUND = 200
+        const val RESULT_DEP_INSTALLED = 200
         const val RESULT_REPO_NOT_FOUND = 404
     }
 
     override suspend fun call(command: Install): Int {
 
-        val dependencyName = command.dependencyName.trim().toLowerCase()
+        val depName = command.depName.trim().toLowerCase()
 
         // first get from
-        val gpmDependency = getDependency(command, dependencyName)
+        val gpmDep = getDep(command, depName)
             ?: return RESULT_REPO_NOT_FOUND
 
 
-        val depTypes = mutableListOf<GradleDependency.Type>().apply {
+        val depTypes = mutableListOf<GradleDep.Type>().apply {
 
             if (command.isSave) {
-                add(GradleDependency.Type.IMP)
+                add(GradleDep.Type.IMP)
             }
 
             if (command.isSaveDev) {
-                add(GradleDependency.Type.TEST_IMP)
+                add(GradleDep.Type.TEST_IMP)
             }
 
             if (command.isSaveDevAndroid) {
-                add(GradleDependency.Type.AND_TEST_IMP)
+                add(GradleDep.Type.AND_TEST_IMP)
             }
 
             // Still empty
-            if (isEmpty() && !gpmDependency.defaultType.isNullOrBlank()) {
+            if (isEmpty() && !gpmDep.defaultType.isNullOrBlank()) {
                 // setting default dependency
-                val depType = GradleDependency.Type.values().find { it.keyword == gpmDependency.defaultType.trim() }
-                    ?: throw IllegalArgumentException("Invalid default type '${gpmDependency.defaultType}'")
+                val depType = GradleDep.Type.values().find { it.keyword == gpmDep.defaultType.trim() }
+                    ?: throw IllegalArgumentException("Invalid default type '${gpmDep.defaultType}'")
 
                 add(depType)
             }
@@ -55,7 +55,7 @@ class InstallViewModel @Inject constructor(
             // Still Empty?
             if (isEmpty()) {
                 // adding default
-                add(GradleDependency.Type.IMP)
+                add(GradleDep.Type.IMP)
             }
         }
 
@@ -65,30 +65,30 @@ class InstallViewModel @Inject constructor(
 
         // Adding each dependency
         for (depType in depTypes) {
-            gradleManager.addDependency(
-                dependencyName,
+            gradleManager.addDep(
+                depName,
                 depType,
-                gpmDependency
+                gpmDep
             )
         }
 
-        return RESULT_REPO_FOUND
+        return RESULT_DEP_INSTALLED
     }
 
-    private suspend fun getDependency(install: Install, dependencyName: String): GpmDependency? {
-        var gpmDependency = gpmRepo.getDependency(dependencyName)
+    private suspend fun getDep(install: Install, depName: String): GpmDep? {
+        var gpmDep = gpmRepo.getDep(depName)
 
-        if (gpmDependency == null) {
+        if (gpmDep == null) {
             // Searching for maven
-            gpmDependency = getFromMaven(install, dependencyName)
+            gpmDep = getFromMaven(install, depName)
         }
 
-        return gpmDependency
+        return gpmDep
     }
 
-    private suspend fun getFromMaven(install: Install, dependencyName: String): GpmDependency? {
+    private suspend fun getFromMaven(install: Install, depName: String): GpmDep? {
 
-        val mavenDeps = mavenRepo.search(dependencyName)
+        val mavenDeps = mavenRepo.search(depName)
 
         if (mavenDeps.isNotEmpty()) {
             val mostUsed = mavenDeps.maxBy { it.usage }!!
@@ -104,24 +104,24 @@ class InstallViewModel @Inject constructor(
                     }
                 }
             )
-            val selectedMavenDep = mavenDeps[selDepId - 1]
+            val selMavenDep = mavenDeps[selDepId - 1]
 
             // Getting last version
             val artifactInfo = mavenRepo.getLatestVersion(
-                selectedMavenDep.groupId,
-                selectedMavenDep.artifactId
+                selMavenDep.groupId,
+                selMavenDep.artifactId
             )
 
-            require(artifactInfo != null) { "Failed to artifact information for $selectedMavenDep" }
+            require(artifactInfo != null) { "Failed to artifact information for $selMavenDep" }
 
-            return GpmDependency(
-                selectedMavenDep.artifactId,
-                GradleDependency.Type.IMP.keyword,
-                selectedMavenDep.url,
+            return GpmDep(
+                selMavenDep.artifactId,
+                GradleDep.Type.IMP.keyword,
+                selMavenDep.url,
                 artifactInfo.repoName,
                 null,
-                selectedMavenDep.groupId,
-                selectedMavenDep.name,
+                selMavenDep.groupId,
+                selMavenDep.name,
                 artifactInfo.version
             )
         } else {
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
index 9a33766..8b29cd5 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
@@ -33,7 +33,7 @@ class Uninstall : Callable<Int> {
     var isSaveDevAndroid: Boolean = false
 
     @CommandLine.Parameters(index = "0", description = ["Dependency name"])
-    lateinit var dependencyName: String
+    lateinit var depName: String
 
     @Inject
     lateinit var uninstallViewModel: UninstallViewModel
diff --git a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
index fd541a7..8056a10 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
@@ -1,9 +1,8 @@
 package com.theapache64.gpm.core
 
 import com.squareup.moshi.Moshi
-import com.theapache64.gpm.core.gm.GradleDependency
-import com.theapache64.gpm.core.gm.GradleManager
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.core.gm.GradleDep
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import com.theapache64.gpm.models.GpmFileData
 import com.theapache64.gpm.utils.GpmConfig
 import java.io.File
@@ -22,7 +21,7 @@ class TransactionManager(
         }
     }
 
-    fun add(installedName: String, type: GradleDependency.Type, newGpmDep: GpmDependency) {
+    fun add(installedName: String, type: GradleDep.Type, newGpmDep: GpmDep) {
         // Need to login
         val adapter = moshi.adapter(GpmFileData::class.java).indent(" ")
         val depToStore = GpmFileData.AddedDep(
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDep.kt
similarity index 91%
rename from src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt
rename to src/main/kotlin/com/theapache64/gpm/core/gm/GradleDep.kt
index 9c732f9..692011f 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDep.kt
@@ -1,6 +1,6 @@
 package com.theapache64.gpm.core.gm
 
-data class GradleDependency(
+data class GradleDep(
     val type: Type,
     val groupId: String,
     val artifactId: String,
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
index 6f8b51d..8787818 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -1,7 +1,7 @@
 package com.theapache64.gpm.core.gm
 
 import com.theapache64.gpm.core.TransactionManager
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import com.theapache64.gpm.utils.GradleUtils
 import com.theapache64.gpm.utils.StringUtils
 import com.theapache64.gpm.utils.insertAt
@@ -17,17 +17,17 @@ class GradleManager constructor(
 ) {
 
     companion object {
-        private val DEPENDENCY_REGEX by lazy {
+        private val DEP_REGEX by lazy {
             "(?<type>androidTestImplementation|testImplementation|implementation)\\s*\\(?[\"'](?<groupId>.+?):(?<artifactId>.+?):(?<version>.+?)[\"']\\)?".toRegex()
         }
 
-        private const val KEY_DEPENDENCIES = "dependencies"
+        private const val KEY_DEP = "dependencies"
     }
 
-    fun parseDependencies(): List<GradleDependency> {
-        val deps = mutableListOf<GradleDependency>()
+    fun parseDeps(): List<GradleDep> {
+        val deps = mutableListOf<GradleDep>()
         val fileContent = gradleFile.readText()
-        val matchResults = DEPENDENCY_REGEX.findAll(fileContent)
+        val matchResults = DEP_REGEX.findAll(fileContent)
 
         for (result in matchResults) {
 
@@ -36,11 +36,11 @@ class GradleManager constructor(
             val artifactId = result.groups["artifactId"]!!.value
             val version = result.groups["version"]!!.value
 
-            val gdType = GradleDependency.Type.values().find { it.keyword == type }
+            val gdType = GradleDep.Type.values().find { it.keyword == type }
                 ?: throw IllegalArgumentException("Couldn't find dependency type for '$type.'")
 
             deps.add(
-                GradleDependency(
+                GradleDep(
                     gdType,
                     groupId,
                     artifactId,
@@ -56,10 +56,10 @@ class GradleManager constructor(
      * To add dependency
      */
     @Throws(IndexOutOfBoundsException::class)
-    fun addDependency(
+    fun addDep(
         installedName: String,
-        type: GradleDependency.Type,
-        newGpmDep: GpmDependency
+        type: GradleDep.Type,
+        newGpmDep: GpmDep
     ) {
 
         val fileContent = gradleFile.readText()
@@ -74,12 +74,12 @@ class GradleManager constructor(
             newGpmDep.version!!
         )
 
-        if (fileContent.contains(KEY_DEPENDENCIES)) {
+        if (fileContent.contains(KEY_DEP)) {
 
             val newDepSign = "\n\t//$name:$description\n\t$fullSignature\n"
 
             // Appending dependency
-            val depIndex = fileContent.indexOf(KEY_DEPENDENCIES)
+            val depIndex = fileContent.indexOf(KEY_DEP)
             val openIndex = fileContent.indexOf('{', depIndex)
             val closingIndex = StringUtils.getClosingIndexOf(fileContent, '{', openIndex, '}')
             val newContent = fileContent.insertAt(closingIndex, newDepSign)
@@ -89,7 +89,7 @@ class GradleManager constructor(
         } else {
 
             // Adding first dependency
-            val firstDependency = """
+            val firstDep = """
                 
                 // Project Dependencies
                 dependencies {
@@ -99,7 +99,7 @@ class GradleManager constructor(
                 }
                 
             """.trimIndent()
-            gradleFile.appendText(firstDependency)
+            gradleFile.appendText(firstDep)
         }
 
         transactionManager.add(installedName, type, newGpmDep)
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
index 936eaf1..1bb7996 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/GpmApiInterface.kt
@@ -1,6 +1,6 @@
 package com.theapache64.gpm.data.remote.gpm
 
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import retrofit2.http.GET
 import retrofit2.http.Path
 
@@ -9,6 +9,6 @@ interface GpmApiInterface {
     @GET("registry/{name}.json")
     suspend fun getDependency(
         @Path("name") repoName: String
-    ): GpmDependency
+    ): GpmDep
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDep.kt
similarity index 96%
rename from src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
rename to src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDep.kt
index 4afe872..1e1b916 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDependency.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/remote/gpm/models/GpmDep.kt
@@ -2,7 +2,7 @@ package com.theapache64.gpm.data.remote.gpm.models
 
 import com.squareup.moshi.Json
 
-data class GpmDependency(
+data class GpmDep(
     @Json(name = "artifact_id")
     val artifactId: String, // okhttp
     @Json(name = "default_type")
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
index 69fdf27..d77c3ec 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/GpmRepo.kt
@@ -1,15 +1,10 @@
 package com.theapache64.gpm.data.repos
 
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import retrofit2.HttpException
-import java.lang.IllegalArgumentException
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlin.coroutines.CoroutineContext
 
 @Singleton
 class GpmRepo @Inject constructor(
@@ -20,11 +15,11 @@ class GpmRepo @Inject constructor(
     /**
      * To get dependency from GPM github registry
      */
-    suspend fun getDependency(dependencyName: String): GpmDependency? =
+    suspend fun getDep(depName: String): GpmDep? =
         try {
-            val dep = gpmApiInterface.getDependency(dependencyName)
+            val dep = gpmApiInterface.getDependency(depName)
             val versionInfo = mavenRepo.getLatestVersion(dep.groupId, dep.artifactId)
-            require(versionInfo != null) { "Couldn't get version info for '$dependencyName'" }
+            require(versionInfo != null) { "Couldn't get version info for '$depName'" }
             dep.version = versionInfo.version
             dep
         } catch (e: HttpException) {
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
index c36a9c5..3fde818 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
@@ -5,7 +5,6 @@ import com.theapache64.gpm.data.remote.maven.models.ArtifactInfo
 import com.theapache64.gpm.data.remote.maven.models.SearchResult
 import com.theapache64.gpm.utils.removeNewLinesAndMultipleSpaces
 import org.apache.commons.text.StringEscapeUtils
-import java.io.File
 import java.text.SimpleDateFormat
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -27,9 +26,9 @@ class MavenRepo @Inject constructor(
         private val SEARCH_RESULT_DATE_FORMAT = SimpleDateFormat("MMM dd, yyyy")
     }
 
-    suspend fun search(dependencyName: String): List<SearchResult> {
+    suspend fun search(depName: String): List<SearchResult> {
 
-        val htmlResp = mavenApiInterface.search(dependencyName).removeNewLinesAndMultipleSpaces()
+        val htmlResp = mavenApiInterface.search(depName).removeNewLinesAndMultipleSpaces()
         val matches = SEARCH_RESULT_REGEX.findAll(htmlResp)
         val searchResults = mutableListOf<SearchResult>()
         for (match in matches) {
diff --git a/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt b/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
index 75c0d35..4cf31a6 100644
--- a/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
+++ b/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
@@ -1,8 +1,7 @@
 package com.theapache64.gpm.models
 
 import com.squareup.moshi.Json
-import com.theapache64.gpm.core.gm.GradleDependency
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 
 class GpmFileData(
     @Json(name = "added")
@@ -14,6 +13,6 @@ class GpmFileData(
         @Json(name = "installed_name")
         val installedName: String,
         @Json(name = "gpm_dep")
-        val gpmDependency: GpmDependency
+        val gpmDep: GpmDep
     )
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index 1ba3b6b..99cc68b 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -33,35 +33,35 @@ class InstallTest {
     @Test
     fun `Install default`() {
         val exitCode = cmd.execute("install", "okhttp")
-        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("implementation 'com.squareup.okhttp3:okhttp:")
     }
 
     @Test
     fun `Install non existing registry`() {
         val exitCode = cmd.execute("install", "retrofit")
-        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("implementation 'com.squareup.retrofit2:retrofit")
     }
 
     @Test
     fun `Install --save`() {
         val exitCode = cmd.execute("install", "--save", "okhttp")
-        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("implementation 'com.squareup.okhttp3:okhttp:")
     }
 
     @Test
     fun `Install --save-dev`() {
         val exitCode = cmd.execute("install", "--save-dev", "okhttp")
-        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("testImplementation 'com.squareup.okhttp3:okhttp:")
     }
 
     @Test
     fun `Install --save-dev-android`() {
         val exitCode = cmd.execute("install", "--save-dev-android", "okhttp")
-        exitCode.should.equal(InstallViewModel.RESULT_REPO_FOUND)
+        exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("androidTestImplementation 'com.squareup.okhttp3:okhttp:")
     }
 
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
index c67dbf1..247b776 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
@@ -1,7 +1,8 @@
 package com.theapache64.gpm.commands.subcommands.uninstall
 
 import com.theapache64.gpm.commands.Gpm
-import org.junit.Assert.*
+import com.theapache64.gpm.commands.subcommands.install.InstallViewModel
+import com.winterbe.expekt.should
 import org.junit.Before
 import org.junit.Test
 import picocli.CommandLine
@@ -23,6 +24,7 @@ class UninstallTest {
     fun `Uninstall installed dependency`() {
         // Install dependency
         val installExitCode = cmd.execute("install", "okhttp")
+        installExitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
     }
 
     @Test
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
index 4131a1f..4dfbbdc 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/GpmRepoTest.kt
@@ -32,20 +32,20 @@ class GpmRepoTest {
 
     @Test
     fun `Valid search`() = runBlockingUnitTest {
-        val dependency = gmpRepo.getDependency("okhttp")
-        dependency.should.not.`null`
-        dependency!!.name.should.equal("OkHttp")
-        dependency.github.should.equal("square/okhttp")
-        dependency.docs.should.equal("https://square.github.io/okhttp/")
-        dependency.groupId.should.equal("com.squareup.okhttp3")
-        dependency.artifactId.should.equal("okhttp")
-        dependency.getFrom.should.equal("maven")
-        dependency.defaultType.should.equal("implementation")
+        val dep = gmpRepo.getDep("okhttp")
+        dep.should.not.`null`
+        dep!!.name.should.equal("OkHttp")
+        dep.github.should.equal("square/okhttp")
+        dep.docs.should.equal("https://square.github.io/okhttp/")
+        dep.groupId.should.equal("com.squareup.okhttp3")
+        dep.artifactId.should.equal("okhttp")
+        dep.getFrom.should.equal("maven")
+        dep.defaultType.should.equal("implementation")
     }
 
     @Test
     fun `Invalid search`() = runBlockingUnitTest {
-        gmpRepo.getDependency("fghdfghfgh").should.`null`
+        gmpRepo.getDep("fghdfghfgh").should.`null`
     }
 
 
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
index 87d40cf..f62b80b 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
@@ -27,14 +27,14 @@ class MavenRepoTest {
 
     @Test
     fun `Valid search`() = runBlockingUnitTest {
-        val dependency = mavenRepo.search("okhttp")
-        dependency.size.should.above(1)
+        val dep = mavenRepo.search("okhttp")
+        dep.size.should.above(1)
     }
 
     @Test
     fun `Invalid search`() = runBlockingUnitTest {
-        val dependency = mavenRepo.search("dsfgdfgdsf")
-        dependency.size.should.equal(0)
+        val dep = mavenRepo.search("dsfgdfgdsf")
+        dep.size.should.equal(0)
     }
 
     @Test
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index a016e9a..96241f1 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -1,9 +1,9 @@
 package com.theapache64.gpm.utils
 
 import com.theapache64.gpm.core.TransactionManager
-import com.theapache64.gpm.core.gm.GradleDependency
+import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.core.gm.GradleManager
-import com.theapache64.gpm.data.remote.gpm.models.GpmDependency
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import com.theapache64.gpm.rules.MyDaggerMockRule
 import com.winterbe.expekt.should
 import it.cosenonjaviste.daggermock.InjectFromComponent
@@ -32,13 +32,13 @@ class GradleManagerTest {
 
     @Test
     fun whenGetDependenciesSize_then10() {
-        gradleManager.parseDependencies().size.should.equal(37)
-        gradleManager.addDependency(
+        gradleManager.parseDeps().size.should.equal(37)
+        gradleManager.addDep(
             "my-artifact",
-            GradleDependency.Type.IMP,
-            GpmDependency(
+            GradleDep.Type.IMP,
+            GpmDep(
                 "myArtifact",
-                GradleDependency.Type.IMP.keyword,
+                GradleDep.Type.IMP.keyword,
                 "https://mylib.docs",
                 "jcenter",
                 "https://github.com/userx/myArtifact",
@@ -48,6 +48,6 @@ class GradleManagerTest {
                 "1.0.0"
             )
         )
-        gradleManager.parseDependencies().size.should.equal(38)
+        gradleManager.parseDeps().size.should.equal(38)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt
index 3ab43b0..d9934e9 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt
@@ -1,8 +1,7 @@
 package com.theapache64.gpm.utils
 
-import com.theapache64.gpm.core.gm.GradleDependency
+import com.theapache64.gpm.core.gm.GradleDep
 import com.winterbe.expekt.should
-import org.junit.Assert.*
 import org.junit.Test
 
 class GradleUtilsTest {
@@ -10,7 +9,7 @@ class GradleUtilsTest {
     fun `Full signature for implementation`() {
 
         val gradleDependency = GradleUtils.getFullSignature(
-            GradleDependency.Type.IMP.keyword,
+            GradleDep.Type.IMP.keyword,
             "org.mockito",
             "mockito",
             "3.3.3"
@@ -25,7 +24,7 @@ class GradleUtilsTest {
     fun `Full signature for testImplementation`() {
 
         val gradleDependency = GradleUtils.getFullSignature(
-            GradleDependency.Type.TEST_IMP.keyword,
+            GradleDep.Type.TEST_IMP.keyword,
             "org.mockito",
             "mockito",
             "3.3.3"
@@ -40,7 +39,7 @@ class GradleUtilsTest {
     fun `Full signature for androidTestImplementation`() {
 
         val gradleDependency = GradleUtils.getFullSignature(
-            GradleDependency.Type.AND_TEST_IMP.keyword,
+            GradleDep.Type.AND_TEST_IMP.keyword,
             "org.mockito",
             "mockito",
             "3.3.3"

From 4a5979ff7717133dcff6ffe08220612094237349 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Tue, 5 May 2020 12:09:24 +0530
Subject: [PATCH 16/24] =?UTF-8?q?=F0=9F=8C=9B=20implement=20first=20stage?=
 =?UTF-8?q?=20of=20uninstall?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/theapache64/gpm/commands/Gpm.kt       |  4 +-
 .../gpm/commands/base/BaseCommand.kt          | 26 +++++++++++++
 .../commands/subcommands/install/Install.kt   | 28 ++++---------
 .../subcommands/install/InstallViewModel.kt   |  4 +-
 .../subcommands/uninstall/Uninstall.kt        | 14 ++++++-
 .../uninstall/UninstallViewModel.kt           | 33 +++++++++++++++-
 .../gpm/core/TransactionManager.kt            | 21 ++++++++--
 .../theapache64/gpm/core/gm/GradleManager.kt  | 28 +++++++++++++
 .../gpm/di/components/UninstallComponent.kt   |  2 +
 .../gpm/di/modules/GradleModule.kt            | 39 ++++++++++++++-----
 .../subcommands/uninstall/UninstallTest.kt    |  4 ++
 .../gpm/data/repos/MavenRepoTest.kt           |  2 +-
 .../theapache64/gpm/rules/MyDaggerMockRule.kt |  2 +-
 13 files changed, 165 insertions(+), 42 deletions(-)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/commands/base/BaseCommand.kt

diff --git a/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt b/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
index 1c4f3d4..aa3e3df 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
@@ -1,13 +1,15 @@
 package com.theapache64.gpm.commands
 
 import com.theapache64.gpm.commands.subcommands.install.Install
+import com.theapache64.gpm.commands.subcommands.uninstall.Uninstall
 import picocli.CommandLine
 
 @CommandLine.Command(
     name = "gpm",
     version = ["v1.0.0-alpha01"],
     subcommands = [
-        Install::class
+        Install::class,
+        Uninstall::class
     ]
 )
 class Gpm {
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/base/BaseCommand.kt b/src/main/kotlin/com/theapache64/gpm/commands/base/BaseCommand.kt
new file mode 100644
index 0000000..ace55fb
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/commands/base/BaseCommand.kt
@@ -0,0 +1,26 @@
+package com.theapache64.gpm.commands.base
+
+import com.theapache64.gpm.utils.GpmConfig
+import com.theapache64.gpm.utils.InputUtils
+import kotlinx.coroutines.delay
+import java.util.concurrent.Callable
+
+abstract class BaseCommand<T> : Callable<T> {
+
+    suspend fun chooseIndex(items: List<String>): Int {
+
+        println("Choose: ")
+
+        items.forEachIndexed() { index: Int, string: String ->
+            println("${index + 1}) $string")
+        }
+
+        @Suppress("ConstantConditionIf")
+        return if (GpmConfig.IS_DEBUG_MODE) {
+            delay(1000)
+            1
+        } else {
+            InputUtils.getInt("Choose one", 1, items.size) - 1
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
index 7fbcba1..53d0cfe 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
@@ -1,6 +1,8 @@
 package com.theapache64.gpm.commands.subcommands.install
 
+import com.theapache64.gpm.commands.base.BaseCommand
 import com.theapache64.gpm.di.components.DaggerInstallComponent
+import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.utils.GpmConfig
 import com.theapache64.gpm.utils.InputUtils
 import kotlinx.coroutines.delay
@@ -14,7 +16,7 @@ import javax.inject.Inject
     aliases = ["i"],
     description = ["To install the dependency"]
 )
-class Install : Callable<Int> {
+class Install : BaseCommand<Int>() {
 
     @CommandLine.Option(
         names = ["-S", "--save"],
@@ -41,28 +43,14 @@ class Install : Callable<Int> {
     lateinit var installViewModel: InstallViewModel
 
     init {
-        DaggerInstallComponent.create().inject(this)
+        DaggerInstallComponent
+            .builder()
+            .gradleModule(GradleModule(true))
+            .build()
+            .inject(this)
     }
 
     override fun call(): Int = runBlocking {
         installViewModel.call(this@Install)
     }
-
-    suspend fun chooseIndex(items: List<String>): Int {
-
-        println("Choose: ")
-
-        items.forEachIndexed() { index: Int, string: String ->
-            println("${index + 1}) $string")
-        }
-
-        @Suppress("ConstantConditionIf")
-        return if (GpmConfig.IS_DEBUG_MODE) {
-            delay(1000)
-            1
-        } else {
-            InputUtils.getInt("Choose one", 1, items.size)
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
index 8e7ac61..9a1f4ca 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
@@ -92,7 +92,7 @@ class InstallViewModel @Inject constructor(
 
         if (mavenDeps.isNotEmpty()) {
             val mostUsed = mavenDeps.maxBy { it.usage }!!
-            val selDepId = install.chooseIndex(
+            val selDepIndex = install.chooseIndex(
                 mavenDeps.map {
                     val text = "${it.groupId}:${it.artifactId}"
                     if (it == mostUsed) {
@@ -104,7 +104,7 @@ class InstallViewModel @Inject constructor(
                     }
                 }
             )
-            val selMavenDep = mavenDeps[selDepId - 1]
+            val selMavenDep = mavenDeps[selDepIndex]
 
             // Getting last version
             val artifactInfo = mavenRepo.getLatestVersion(
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
index 8b29cd5..399a1ea 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
@@ -1,7 +1,9 @@
 package com.theapache64.gpm.commands.subcommands.uninstall
 
+import com.theapache64.gpm.commands.base.BaseCommand
 import com.theapache64.gpm.di.components.DaggerUninstallComponent
 import com.theapache64.gpm.di.components.UninstallComponent
+import com.theapache64.gpm.di.modules.GradleModule
 import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import java.util.concurrent.Callable
@@ -12,7 +14,7 @@ import javax.inject.Inject
     aliases = ["u"],
     description = ["To uninstall a dependency"]
 )
-class Uninstall : Callable<Int> {
+class Uninstall : BaseCommand<Int>() {
 
     @CommandLine.Option(
         names = ["-S", "--save"],
@@ -39,10 +41,18 @@ class Uninstall : Callable<Int> {
     lateinit var uninstallViewModel: UninstallViewModel
 
     init {
-        DaggerUninstallComponent.create().inject(this)
+        DaggerUninstallComponent
+            .builder()
+            .gradleModule(GradleModule(false))
+            .build()
+            .inject(this)
     }
 
     override fun call(): Int = runBlocking {
         uninstallViewModel.call(this@Uninstall)
     }
+
+    fun onNoDepInstalled(depName: String) {
+        println("No dependency installed with '$depName' using gpm. You might have installed it manually.")
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
index 2b090a8..c6ca7f9 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
@@ -1,14 +1,43 @@
 package com.theapache64.gpm.commands.subcommands.uninstall
 
 import com.theapache64.gpm.commands.base.BaseViewModel
+import com.theapache64.gpm.core.TransactionManager
+import com.theapache64.gpm.core.gm.GradleManager
 import javax.inject.Inject
 
 class UninstallViewModel @Inject constructor(
-
+    private val tm: TransactionManager,
+    private val gradleManager: GradleManager
 ) : BaseViewModel<Uninstall>() {
 
+    companion object {
+        const val RESULT_DEP_UNINSTALLED = 123
+        const val RESULT_NO_DEP_INSTALLED = 134
+    }
+
     override suspend fun call(command: Uninstall): Int {
-        TODO("Not yet implemented")
+        val depName = command.depName.trim().toLowerCase()
+        val installedDeps = tm.getInstalled(depName)
+
+        if (installedDeps.isEmpty()) {
+            command.onNoDepInstalled(depName)
+            return RESULT_NO_DEP_INSTALLED
+        }
+
+        val depToRemove = if (installedDeps.size > 1) {
+            // multiple, choose one
+            val selDepIndex = command.chooseIndex(installedDeps.map {
+                "${it.type} ${it.gpmDep.groupId}:${it.gpmDep.artifactId}"
+            })
+
+            installedDeps[selDepIndex]
+
+        } else {
+            installedDeps.first()
+        }
+
+        gradleManager.removeDep(depToRemove)
+        return RESULT_DEP_UNINSTALLED
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
index 8056a10..4484b81 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
@@ -1,15 +1,22 @@
 package com.theapache64.gpm.core
 
+import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import com.theapache64.gpm.models.GpmFileData
 import com.theapache64.gpm.utils.GpmConfig
 import java.io.File
+import javax.inject.Inject
 
-class TransactionManager(
+class TransactionManager @Inject constructor(
     private val moshi: Moshi
 ) {
+
+    private val adapter: JsonAdapter<GpmFileData> by lazy {
+        moshi.adapter(GpmFileData::class.java).indent(" ")
+    }
+
     companion object {
         private val GPM_FILE by lazy {
             @Suppress("ConstantConditionIf")
@@ -23,7 +30,7 @@ class TransactionManager(
 
     fun add(installedName: String, type: GradleDep.Type, newGpmDep: GpmDep) {
         // Need to login
-        val adapter = moshi.adapter(GpmFileData::class.java).indent(" ")
+
         val depToStore = GpmFileData.AddedDep(
             type.keyword,
             installedName,
@@ -38,9 +45,15 @@ class TransactionManager(
         }
 
 
-        val gpmFileDataJson = adapter
-            .toJson(newFileData)
+        val gpmFileDataJson = adapter.toJson(newFileData)
 
         GPM_FILE.writeText(gpmFileDataJson)
     }
+
+    fun getInstalled(depName: String): List<GpmFileData.AddedDep> {
+        val gpmFileData = adapter.fromJson(GPM_FILE.readText())!!
+        return gpmFileData.deps.filter {
+            it.installedName == depName
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
index 8787818..04d57c2 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -2,10 +2,12 @@ package com.theapache64.gpm.core.gm
 
 import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.data.remote.gpm.models.GpmDep
+import com.theapache64.gpm.models.GpmFileData
 import com.theapache64.gpm.utils.GradleUtils
 import com.theapache64.gpm.utils.StringUtils
 import com.theapache64.gpm.utils.insertAt
 import java.io.File
+import java.io.IOException
 import java.lang.IllegalArgumentException
 
 /**
@@ -105,4 +107,30 @@ class GradleManager constructor(
         transactionManager.add(installedName, type, newGpmDep)
     }
 
+    /**
+     * To remove dependency
+     */
+    fun removeDep(depToRemove: GpmFileData.AddedDep) {
+
+        val name = depToRemove.gpmDep.name
+        val description = depToRemove.gpmDep.description
+        val groupId = depToRemove.gpmDep.groupId
+        val artifactId = depToRemove.gpmDep.artifactId
+
+
+        val depRegEx = ("\\s*\\/\\/$name:$description\n" +
+                "\\s*${depToRemove.type}\\s*\\(?['\"]$groupId:$artifactId:.+?['\"]\\)?").toRegex()
+
+
+        val fileContent = gradleFile.readText()
+        val newFileContent = fileContent.replace(depRegEx, "")
+
+        if (fileContent.length != newFileContent.length) {
+            // dep removed
+            gradleFile.writeText(newFileContent)
+        } else {
+            throw IOException("Failed to remove dependency. Signature might have changed")
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
index f02a153..29198d5 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
@@ -3,7 +3,9 @@ package com.theapache64.gpm.di.components
 import com.theapache64.gpm.commands.subcommands.uninstall.Uninstall
 import com.theapache64.gpm.di.modules.ViewModelModule
 import dagger.Component
+import javax.inject.Singleton
 
+@Singleton
 @Component(
     modules = [ViewModelModule::class]
 )
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index 1e73210..0555bac 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -7,25 +7,46 @@ import com.theapache64.gpm.core.gm.GradleManager
 import dagger.Module
 import dagger.Provides
 import java.io.File
+import java.lang.IllegalArgumentException
 
 @Module(includes = [TransactionModule::class])
-class GradleModule {
+class GradleModule(
+    val isDeleteTempFile: Boolean
+) {
 
     @Provides
     fun gradleFile(): File {
 
         @Suppress("ConstantConditionIf")
-        val filePath = if (GpmConfig.IS_DEBUG_MODE) {
-            val sampleFile = File("assets/sample.build.gradle")
+        return if (GpmConfig.IS_DEBUG_MODE) {
+
             val tempGradleFile = File("assets/temp.build.gradle")
-            tempGradleFile.delete()
-            sampleFile.copyTo(tempGradleFile)
-            tempGradleFile.absolutePath
+
+            if (isDeleteTempFile) {
+                val sampleFile = File("assets/sample.build.gradle")
+                tempGradleFile.delete()
+                sampleFile.copyTo(tempGradleFile)
+            }
+
+            tempGradleFile
         } else {
-            "app/build.gradle"
-        }
+            val androidGradleFile = File("app/build.gradle")
+            val jvmGradleFile = File("build.gradle")
+            when {
+                androidGradleFile.exists() -> {
+                    // android project
+                    androidGradleFile
+                }
+
+                jvmGradleFile.exists() -> {
+                    jvmGradleFile
+                }
 
-        return File(filePath)
+                else -> {
+                    throw IllegalArgumentException("Invalid directory. Are you sure that you're executing the command from project root?")
+                }
+            }
+        }
     }
 
 
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
index 247b776..9c63aad 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
@@ -25,6 +25,10 @@ class UninstallTest {
         // Install dependency
         val installExitCode = cmd.execute("install", "okhttp")
         installExitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
+
+        // Uninstall dep
+        val uninstallExitCode = cmd.execute("uninstall", "okhttp")
+        uninstallExitCode.should.equal(UninstallViewModel.RESULT_DEP_UNINSTALLED)
     }
 
     @Test
diff --git a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
index f62b80b..0ff0d42 100644
--- a/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/data/repos/MavenRepoTest.kt
@@ -41,7 +41,7 @@ class MavenRepoTest {
     fun `Getting valid artifact information`() = runBlockingUnitTest {
         val info = mavenRepo.getLatestVersion("org.junit.jupiter", "junit-jupiter-api")
         info.should.not.`null`
-        info!!.version.should.equal("5.7.0-M1")
+        info!!.version.should.not.empty
         info.repoName.should.equal("Central")
         info.repoUrl.should.equal("/repos/central")
     }
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
index 87e5d6b..24c6742 100644
--- a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
@@ -9,5 +9,5 @@ import it.cosenonjaviste.daggermock.DaggerMockRule
 class MyDaggerMockRule : DaggerMockRule<InstallComponent>(
     InstallComponent::class.java,
     NetworkModule(),
-    GradleModule()
+    GradleModule(true)
 )
\ No newline at end of file

From 593a65e252a2eb8cd8883e7166ac43765fa44650 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Wed, 6 May 2020 08:17:48 +0530
Subject: [PATCH 17/24] =?UTF-8?q?=E2=98=91=EF=B8=8F=20replaced=20remote=20?=
 =?UTF-8?q?test=20with=20local=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   4 +-
 .../com/theapache64/gpm/commands/Gpm.kt       |   5 +-
 .../base/BaseInstallUninstallViewModel.kt     |  42 ++++++++
 .../commands/subcommands/install/Install.kt   |   1 +
 .../subcommands/install/InstallViewModel.kt   |  42 ++------
 .../subcommands/uninstall/Uninstall.kt        |  11 +-
 .../uninstall/UninstallViewModel.kt           |  48 ++++++---
 .../gpm/core/TransactionManager.kt            |  57 ++++++++--
 .../com/theapache64/gpm/core/gm/GradleDep.kt  |   2 +-
 .../theapache64/gpm/core/gm/GradleManager.kt  |  23 ++--
 .../theapache64/gpm/data/repos/MavenRepo.kt   |   3 +
 .../gpm/di/components/InstallComponent.kt     |  10 +-
 .../gpm/di/modules/CommandModule.kt           |  16 +++
 .../gpm/di/modules/GradleModule.kt            |   7 +-
 .../gpm/di/modules/NetworkModule.kt           |   1 -
 .../com/theapache64/gpm/models/GpmFileData.kt |   2 +
 .../gpm/commands/subcommands/InstallTest.kt   | 100 ++++++++++++++----
 .../subcommands/uninstall/UninstallTest.kt    |  13 ++-
 .../theapache64/gpm/rules/MyDaggerMockRule.kt |   1 -
 .../gpm/utils/GradleManagerTest.kt            |   2 +-
 .../theapache64/gpm/utils/GradleUtilsTest.kt  |   6 +-
 .../resources/okhttp.mavenrepository.com.html |  61 +++++++++++
 .../test/resources}/sample.build.gradle       |   3 +
 23 files changed, 352 insertions(+), 108 deletions(-)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/commands/base/BaseInstallUninstallViewModel.kt
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/modules/CommandModule.kt
 create mode 100644 src/test/resources/okhttp.mavenrepository.com.html
 rename {assets => src/test/resources}/sample.build.gradle (97%)

diff --git a/.gitignore b/.gitignore
index a53ca17..7ea9177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,6 +136,6 @@ gradle-app.setting
 
 # End of https://www.gitignore.io/api/kotlin,intellij,gradle
 SecretConstants.kt
-assets/temp.build.gradle
+src/test/resources/temp.build.gradle
 x.html
-assets/temp.gpm.json
\ No newline at end of file
+src/test/resources/temp.gpm.json
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt b/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
index aa3e3df..3a854b9 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/Gpm.kt
@@ -3,6 +3,8 @@ package com.theapache64.gpm.commands
 import com.theapache64.gpm.commands.subcommands.install.Install
 import com.theapache64.gpm.commands.subcommands.uninstall.Uninstall
 import picocli.CommandLine
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @CommandLine.Command(
     name = "gpm",
@@ -12,5 +14,6 @@ import picocli.CommandLine
         Uninstall::class
     ]
 )
-class Gpm {
+@Singleton
+class Gpm @Inject constructor() {
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/base/BaseInstallUninstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/base/BaseInstallUninstallViewModel.kt
new file mode 100644
index 0000000..0d434c9
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/commands/base/BaseInstallUninstallViewModel.kt
@@ -0,0 +1,42 @@
+package com.theapache64.gpm.commands.base
+
+import com.theapache64.gpm.core.gm.GradleDep
+
+abstract class BaseInstallUninstallViewModel<T> : BaseViewModel<T>() {
+
+    fun getDepTypes(
+        isSave : Boolean,
+        isSaveDev : Boolean,
+        isSaveDevAndroid:Boolean,
+        defaultType: String?
+    ): List<GradleDep.Type> = mutableListOf<GradleDep.Type>().apply {
+
+        if (isSave) {
+            add(GradleDep.Type.IMP)
+        }
+
+        if (isSaveDev) {
+            add(GradleDep.Type.TEST_IMP)
+        }
+
+        if (isSaveDevAndroid) {
+            add(GradleDep.Type.AND_TEST_IMP)
+        }
+
+        // Still empty
+        if (isEmpty() && !defaultType.isNullOrBlank()) {
+            // setting default dependency
+            val depType = GradleDep.Type.values().find { it.key == defaultType.trim() }
+                ?: throw IllegalArgumentException("Invalid default type '${defaultType}'")
+
+            add(depType)
+        }
+
+        // Still Empty?
+        if (isEmpty()) {
+            // adding default
+            add(GradleDep.Type.IMP)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
index 53d0cfe..a3e9076 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import java.util.concurrent.Callable
 import javax.inject.Inject
+import javax.inject.Singleton
 
 @CommandLine.Command(
     name = "install",
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
index 9a1f4ca..14e19c1 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/InstallViewModel.kt
@@ -1,6 +1,6 @@
 package com.theapache64.gpm.commands.subcommands.install
 
-import com.theapache64.gpm.commands.base.BaseViewModel
+import com.theapache64.gpm.commands.base.BaseInstallUninstallViewModel
 import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.core.gm.GradleManager
 import com.theapache64.gpm.data.remote.gpm.models.GpmDep
@@ -13,7 +13,7 @@ class InstallViewModel @Inject constructor(
     private val gpmRepo: GpmRepo,
     private val mavenRepo: MavenRepo,
     private val gradleManager: GradleManager
-) : BaseViewModel<Install>() {
+) : BaseInstallUninstallViewModel<Install>() {
 
     companion object {
         const val RESULT_DEP_INSTALLED = 200
@@ -29,36 +29,12 @@ class InstallViewModel @Inject constructor(
             ?: return RESULT_REPO_NOT_FOUND
 
 
-        val depTypes = mutableListOf<GradleDep.Type>().apply {
-
-            if (command.isSave) {
-                add(GradleDep.Type.IMP)
-            }
-
-            if (command.isSaveDev) {
-                add(GradleDep.Type.TEST_IMP)
-            }
-
-            if (command.isSaveDevAndroid) {
-                add(GradleDep.Type.AND_TEST_IMP)
-            }
-
-            // Still empty
-            if (isEmpty() && !gpmDep.defaultType.isNullOrBlank()) {
-                // setting default dependency
-                val depType = GradleDep.Type.values().find { it.keyword == gpmDep.defaultType.trim() }
-                    ?: throw IllegalArgumentException("Invalid default type '${gpmDep.defaultType}'")
-
-                add(depType)
-            }
-
-            // Still Empty?
-            if (isEmpty()) {
-                // adding default
-                add(GradleDep.Type.IMP)
-            }
-        }
-
+        val depTypes = getDepTypes(
+            command.isSave,
+            command.isSaveDev,
+            command.isSaveDevAndroid,
+            gpmDep.defaultType
+        )
         require(depTypes.isNotEmpty()) { "Dependency type can't be empty" }
 
         // Getting latest version
@@ -116,7 +92,7 @@ class InstallViewModel @Inject constructor(
 
             return GpmDep(
                 selMavenDep.artifactId,
-                GradleDep.Type.IMP.keyword,
+                GradleDep.Type.IMP.key,
                 selMavenDep.url,
                 artifactInfo.repoName,
                 null,
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
index 399a1ea..bd310d1 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
@@ -1,12 +1,11 @@
 package com.theapache64.gpm.commands.subcommands.uninstall
 
 import com.theapache64.gpm.commands.base.BaseCommand
+import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.di.components.DaggerUninstallComponent
-import com.theapache64.gpm.di.components.UninstallComponent
 import com.theapache64.gpm.di.modules.GradleModule
 import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
-import java.util.concurrent.Callable
 import javax.inject.Inject
 
 @CommandLine.Command(
@@ -52,7 +51,11 @@ class Uninstall : BaseCommand<Int>() {
         uninstallViewModel.call(this@Uninstall)
     }
 
-    fun onNoDepInstalled(depName: String) {
-        println("No dependency installed with '$depName' using gpm. You might have installed it manually.")
+    fun onNoDepInstalled(depType: GradleDep.Type, depName: String) {
+        println("No dependency named '$depName' installed as '${depType.key}' using gpm. You might have installed it manually.")
+    }
+
+    fun onBeforeDepRemove(depType: GradleDep.Type, depName: String) {
+        println("Removing '${depType.key}' of $depName...'")
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
index c6ca7f9..37e1466 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallViewModel.kt
@@ -1,14 +1,15 @@
 package com.theapache64.gpm.commands.subcommands.uninstall
 
-import com.theapache64.gpm.commands.base.BaseViewModel
+import com.theapache64.gpm.commands.base.BaseInstallUninstallViewModel
 import com.theapache64.gpm.core.TransactionManager
+import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.core.gm.GradleManager
 import javax.inject.Inject
 
 class UninstallViewModel @Inject constructor(
     private val tm: TransactionManager,
     private val gradleManager: GradleManager
-) : BaseViewModel<Uninstall>() {
+) : BaseInstallUninstallViewModel<Uninstall>() {
 
     companion object {
         const val RESULT_DEP_UNINSTALLED = 123
@@ -16,27 +17,42 @@ class UninstallViewModel @Inject constructor(
     }
 
     override suspend fun call(command: Uninstall): Int {
+
         val depName = command.depName.trim().toLowerCase()
-        val installedDeps = tm.getInstalled(depName)
 
-        if (installedDeps.isEmpty()) {
-            command.onNoDepInstalled(depName)
-            return RESULT_NO_DEP_INSTALLED
-        }
+        val depTypes = getDepTypes(
+            command.isSave,
+            command.isSaveDev,
+            command.isSaveDevAndroid,
+            GradleDep.Type.IMP.key
+        )
+
+        for (depType in depTypes) {
+
+            command.onBeforeDepRemove(depType, depName)
+            val installedDeps = tm.getInstalled(depType.key, depName)
+            println("Size is ${installedDeps.size}")
+
+            if (installedDeps.isEmpty()) {
+                command.onNoDepInstalled(depType, depName)
+                return RESULT_NO_DEP_INSTALLED
+            }
+
+            val depToRemove = if (installedDeps.size > 1) {
+                // multiple, choose one
+                val selDepIndex = command.chooseIndex(installedDeps.map {
+                    "${it.type} ${it.gpmDep.groupId}:${it.gpmDep.artifactId}"
+                })
 
-        val depToRemove = if (installedDeps.size > 1) {
-            // multiple, choose one
-            val selDepIndex = command.chooseIndex(installedDeps.map {
-                "${it.type} ${it.gpmDep.groupId}:${it.gpmDep.artifactId}"
-            })
+                installedDeps[selDepIndex]
 
-            installedDeps[selDepIndex]
+            } else {
+                installedDeps.first()
+            }
 
-        } else {
-            installedDeps.first()
+            gradleManager.removeDep(depToRemove)
         }
 
-        gradleManager.removeDep(depToRemove)
         return RESULT_DEP_UNINSTALLED
     }
 
diff --git a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
index 4484b81..9b5ec0d 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
@@ -7,6 +7,8 @@ import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import com.theapache64.gpm.models.GpmFileData
 import com.theapache64.gpm.utils.GpmConfig
 import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
 import javax.inject.Inject
 
 class TransactionManager @Inject constructor(
@@ -21,7 +23,7 @@ class TransactionManager @Inject constructor(
         private val GPM_FILE by lazy {
             @Suppress("ConstantConditionIf")
             if (GpmConfig.IS_DEBUG_MODE) {
-                File("assets/temp.gpm.json")
+                File("src/test/resources/temp.gpm.json")
             } else {
                 File("gpm.json")
             }
@@ -29,10 +31,20 @@ class TransactionManager @Inject constructor(
     }
 
     fun add(installedName: String, type: GradleDep.Type, newGpmDep: GpmDep) {
+
         // Need to login
+        val newDepId = getLastDepAdded()?.id?.plus(1) ?: 1
+
+        if (newDepId != 1) {
+            // got prev transaction, so check if this is a duplicate one
+            if (isDuplicate(installedName, type, newGpmDep)) {
+                return
+            }
+        }
 
         val depToStore = GpmFileData.AddedDep(
-            type.keyword,
+            newDepId,
+            type.key,
             installedName,
             newGpmDep
         )
@@ -44,16 +56,47 @@ class TransactionManager @Inject constructor(
             gpmFileData
         }
 
+        setData(newFileData)
+    }
 
-        val gpmFileDataJson = adapter.toJson(newFileData)
+    private fun isDuplicate(installedName: String, type: GradleDep.Type, newGpmDep: GpmDep): Boolean {
+        return getData().deps.find {
+            it.installedName == installedName &&
+                    it.type == type.key &&
+                    it.gpmDep.artifactId == newGpmDep.artifactId &&
+                    it.gpmDep.groupId == newGpmDep.groupId &&
+                    it.gpmDep.name == newGpmDep.name
+        } != null
+    }
+
+    private fun getLastDepAdded(): GpmFileData.AddedDep? {
+        return try {
+            getData().deps.lastOrNull()
+        } catch (e: FileNotFoundException) {
+            null
+        }
+    }
 
+    private fun setData(newFileData: GpmFileData) {
+        val gpmFileDataJson = adapter.toJson(newFileData)
         GPM_FILE.writeText(gpmFileDataJson)
     }
 
-    fun getInstalled(depName: String): List<GpmFileData.AddedDep> {
-        val gpmFileData = adapter.fromJson(GPM_FILE.readText())!!
-        return gpmFileData.deps.filter {
-            it.installedName == depName
+    fun getInstalled(type: String, depName: String): List<GpmFileData.AddedDep> {
+        return getData().deps.filter {
+            it.installedName == depName && it.type == type
+        }
+    }
+
+    fun remove(depToRemove: GpmFileData.AddedDep) {
+        val data = getData()
+        val isRemoved = data.deps.removeIf { it.id == depToRemove.id }
+        if (isRemoved) {
+            setData(data)
+        } else {
+            throw IOException("Failed to remove dependency. Couldn't find dependency with id '${depToRemove.id}'")
         }
     }
+
+    private fun getData() = adapter.fromJson(GPM_FILE.readText())!!
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDep.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDep.kt
index 692011f..a2d1b9a 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDep.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleDep.kt
@@ -6,7 +6,7 @@ data class GradleDep(
     val artifactId: String,
     val version: String
 ) {
-    enum class Type(val keyword: String) {
+    enum class Type(val key: String) {
         IMP("implementation"),
         TEST_IMP("testImplementation"),
         AND_TEST_IMP("androidTestImplementation")
diff --git a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
index 04d57c2..87c7e19 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/gm/GradleManager.kt
@@ -38,7 +38,7 @@ class GradleManager constructor(
             val artifactId = result.groups["artifactId"]!!.value
             val version = result.groups["version"]!!.value
 
-            val gdType = GradleDep.Type.values().find { it.keyword == type }
+            val gdType = GradleDep.Type.values().find { it.key == type }
                 ?: throw IllegalArgumentException("Couldn't find dependency type for '$type.'")
 
             deps.add(
@@ -70,7 +70,7 @@ class GradleManager constructor(
 
 
         val fullSignature = GradleUtils.getFullSignature(
-            type.keyword,
+            type.key,
             newGpmDep.groupId,
             newGpmDep.artifactId,
             newGpmDep.version!!
@@ -78,7 +78,7 @@ class GradleManager constructor(
 
         if (fileContent.contains(KEY_DEP)) {
 
-            val newDepSign = "\n\t//$name:$description\n\t$fullSignature\n"
+            val newDepSign = "\n\t// $name:$description\n\t$fullSignature\n"
 
             // Appending dependency
             val depIndex = fileContent.indexOf(KEY_DEP)
@@ -117,19 +117,26 @@ class GradleManager constructor(
         val groupId = depToRemove.gpmDep.groupId
         val artifactId = depToRemove.gpmDep.artifactId
 
-
-        val depRegEx = ("\\s*\\/\\/$name:$description\n" +
+        val depRegEx = ("(?:\\s*\\/\\/\\s$name:$description)?\n" +
                 "\\s*${depToRemove.type}\\s*\\(?['\"]$groupId:$artifactId:.+?['\"]\\)?").toRegex()
 
-
         val fileContent = gradleFile.readText()
         val newFileContent = fileContent.replace(depRegEx, "")
 
         if (fileContent.length != newFileContent.length) {
-            // dep removed
+            // dep removed, update gradle file
             gradleFile.writeText(newFileContent)
+
+            // remove the transaction also
+            transactionManager.remove(depToRemove)
         } else {
-            throw IOException("Failed to remove dependency. Signature might have changed")
+            throw IOException(
+                """
+                Failed to remove dependency. 
+                Couldn't find `${depToRemove.type} '${groupId}:$artifactId:...'` in ${gradleFile.name}
+                Signature might have changed.
+            """.trimIndent()
+            )
         }
     }
 
diff --git a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
index 3fde818..a5ace8f 100644
--- a/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
+++ b/src/main/kotlin/com/theapache64/gpm/data/repos/MavenRepo.kt
@@ -58,6 +58,9 @@ class MavenRepo @Inject constructor(
         return searchResults
     }
 
+    /**
+     * To get latest version of the given artifactId from the given group
+     */
     suspend fun getLatestVersion(groupId: String, artifactId: String): ArtifactInfo? {
         val htmlResp = mavenApiInterface.getArtifact(groupId, artifactId).removeNewLinesAndMultipleSpaces()
         val results = ARTIFACT_VERSION_REGEX.find(htmlResp)
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index d88c75b..5d33326 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -1,23 +1,24 @@
 package com.theapache64.gpm.di.components
 
+import com.squareup.moshi.Moshi
+import com.theapache64.gpm.commands.Gpm
 import com.theapache64.gpm.commands.subcommands.install.Install
 import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
 import com.theapache64.gpm.data.remote.maven.MavenApiInterface
 import com.theapache64.gpm.data.repos.MavenRepo
-import com.theapache64.gpm.di.modules.GradleModule
-import com.theapache64.gpm.di.modules.NetworkModule
-import com.theapache64.gpm.di.modules.ViewModelModule
+import com.theapache64.gpm.di.modules.*
 import dagger.Component
 import java.io.File
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [ViewModelModule::class, NetworkModule::class, GradleModule::class])
+@Component(modules = [ViewModelModule::class, NetworkModule::class, MoshiModule::class, GradleModule::class, CommandModule::class])
 interface InstallComponent {
     /*
      * For testing
      */
+    fun getGpm(): Gpm
     fun gpmApiInterface(): GpmApiInterface
     fun mavenApiInterface(): MavenApiInterface
     fun gradleFile(): File
@@ -25,4 +26,5 @@ interface InstallComponent {
     fun gpmFileManager(): TransactionManager
 
     fun inject(install: Install)
+    fun moshi(): Moshi
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/CommandModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/CommandModule.kt
new file mode 100644
index 0000000..8f7a2d8
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/CommandModule.kt
@@ -0,0 +1,16 @@
+package com.theapache64.gpm.di.modules
+
+import com.theapache64.gpm.commands.Gpm
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+@Module
+class CommandModule {
+
+    @Singleton
+    @Provides
+    fun provideGpm(): Gpm {
+        return Gpm()
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index 0555bac..3a80524 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -20,15 +20,16 @@ class GradleModule(
         @Suppress("ConstantConditionIf")
         return if (GpmConfig.IS_DEBUG_MODE) {
 
-            val tempGradleFile = File("assets/temp.build.gradle")
+            val tempGradleFile = File("src/test/resources/temp.build.gradle")
 
-            if (isDeleteTempFile) {
-                val sampleFile = File("assets/sample.build.gradle")
+            if (!tempGradleFile.exists() || isDeleteTempFile) {
+                val sampleFile = File("src/test/resources/sample.build.gradle")
                 tempGradleFile.delete()
                 sampleFile.copyTo(tempGradleFile)
             }
 
             tempGradleFile
+
         } else {
             val androidGradleFile = File("app/build.gradle")
             val jvmGradleFile = File("build.gradle")
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
index 8a5182a..e92eed4 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/NetworkModule.kt
@@ -19,7 +19,6 @@ class NetworkModule {
         return Retrofit.Builder()
     }
 
-    @Singleton
     @Provides
     fun provideGpmApiInterface(retrofitBuilder: Retrofit.Builder, moshi: Moshi): GpmApiInterface {
         return retrofitBuilder
diff --git a/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt b/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
index 4cf31a6..2957d0e 100644
--- a/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
+++ b/src/main/kotlin/com/theapache64/gpm/models/GpmFileData.kt
@@ -8,6 +8,8 @@ class GpmFileData(
     val deps: MutableList<AddedDep>
 ) {
     class AddedDep(
+        @Json(name = "id")
+        val id: Int,
         @Json(name = "type")
         val type: String,
         @Json(name = "installed_name")
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index 99cc68b..1ce2fb9 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -1,80 +1,140 @@
 package com.theapache64.gpm.commands.subcommands
 
-import com.theapache64.gpm.commands.Gpm
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import com.theapache64.gpm.commands.subcommands.install.Install
 import com.theapache64.gpm.commands.subcommands.install.InstallViewModel
-import com.theapache64.gpm.rules.MyDaggerMockRule
+import com.theapache64.gpm.core.gm.GradleDep
+import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
+import com.theapache64.gpm.data.remote.maven.MavenApiInterface
+import com.theapache64.gpm.di.components.DaggerInstallComponent
+import com.theapache64.gpm.di.components.InstallComponent
+import com.theapache64.gpm.di.modules.GradleModule
+import com.theapache64.gpm.di.modules.NetworkModule
+import com.theapache64.gpm.runBlockingUnitTest
 import com.winterbe.expekt.should
+import it.cosenonjaviste.daggermock.DaggerMock
 import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import picocli.CommandLine
+import retrofit2.HttpException
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
 
 class InstallTest {
 
-    private lateinit var cmd: CommandLine
+    companion object {
+        private const val OKHTTP = "okhttp"
+        private const val RETROFIT = "retrofit"
+        private const val INVALID_REPO = "^%&^%some-invalid-repo&^%"
+    }
+
+    private lateinit var installCmd: CommandLine
+
+    private val install = Install()
 
     @get:Rule
-    val daggerRule = MyDaggerMockRule()
+    val daggerRule = DaggerMock.rule<InstallComponent>(NetworkModule()) {
+        customizeBuilder<DaggerInstallComponent.Builder> {
+            it.gradleModule(GradleModule(true))
+        }
+        set {
+            it.inject(install)
+        }
+    }
 
     @InjectFromComponent
     lateinit var tempBuildGradle: File
 
+    private var fakeGpmApi: GpmApiInterface = mock()
+    private var fakeMavenApi: MavenApiInterface = mock()
+
     @Before
-    fun setUp() {
-        val gpm = Gpm()
-        this.cmd = CommandLine(gpm)
-        cmd.out = PrintWriter(StringWriter())
+    fun setUp() = runBlockingUnitTest {
+
+        whenever(fakeGpmApi.getDependency(OKHTTP)).thenReturn(
+            GpmDep(
+                "okhttp",
+                GradleDep.Type.IMP.key,
+                "https://square.github.io/okhttp/",
+                "jcenter",
+                "https://github.com/square/okhttp/",
+                "com.squareup.okhttp3",
+                "OkHttp",
+                "Square’s meticulous HTTP client for Java and Kotlin.\n",
+                "4.6.0"
+            )
+        )
+
+        whenever(fakeGpmApi.getDependency(RETROFIT)).thenReturn(
+            GpmDep(
+                "retrofit",
+                GradleDep.Type.IMP.key,
+                "https://square.github.io/retrofit/",
+                "jcenter",
+                "https://github.com/square/retrofit/",
+                "com.squareup.retrofit2",
+                "Retrofit",
+                "Square’s meticulous type-safe HTTP client for Java and Kotlin.\n",
+                "2.8.1"
+            )
+        )
+
+        whenever(fakeMavenApi.getArtifact(any(), any())).thenReturn(
+            File("src/test/resources/okhttp.mavenrepository.com.html").readText()
+        )
+
+        whenever(fakeMavenApi.search(INVALID_REPO)).thenReturn("")
+        whenever(fakeGpmApi.getDependency(INVALID_REPO)).thenThrow(HttpException::class.java)
+
+        this.installCmd = CommandLine(install)
+        installCmd.out = PrintWriter(StringWriter())
     }
 
     @Test
     fun `Install default`() {
-        val exitCode = cmd.execute("install", "okhttp")
+        val exitCode = installCmd.execute("okhttp")
         exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("implementation 'com.squareup.okhttp3:okhttp:")
     }
 
     @Test
     fun `Install non existing registry`() {
-        val exitCode = cmd.execute("install", "retrofit")
+        val exitCode = installCmd.execute("retrofit")
         exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("implementation 'com.squareup.retrofit2:retrofit")
     }
 
     @Test
     fun `Install --save`() {
-        val exitCode = cmd.execute("install", "--save", "okhttp")
+        val exitCode = installCmd.execute("--save", "okhttp")
         exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("implementation 'com.squareup.okhttp3:okhttp:")
     }
 
     @Test
     fun `Install --save-dev`() {
-        val exitCode = cmd.execute("install", "--save-dev", "okhttp")
+        val exitCode = installCmd.execute("--save-dev", "okhttp")
         exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("testImplementation 'com.squareup.okhttp3:okhttp:")
     }
 
     @Test
     fun `Install --save-dev-android`() {
-        val exitCode = cmd.execute("install", "--save-dev-android", "okhttp")
+        val exitCode = installCmd.execute("--save-dev-android", "okhttp")
         exitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
         tempBuildGradle.readText().should.contain("androidTestImplementation 'com.squareup.okhttp3:okhttp:")
     }
 
     @Test
     fun `Install not existing library`() {
-        val exitCode = cmd.execute("install", "fghdfghfgh")
+        val exitCode = installCmd.execute(INVALID_REPO)
         exitCode.should.equal(InstallViewModel.RESULT_REPO_NOT_FOUND)
     }
 
-
-    @Test
-    fun whenInvalidRepoInstall_thenError() {
-        val exitCode = cmd.execute("install", "ghdfghfgh")
-        exitCode.should.equal(InstallViewModel.RESULT_REPO_NOT_FOUND)
-    }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
index 9c63aad..3a0843f 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
@@ -18,10 +18,13 @@ class UninstallTest {
         this.cmd = CommandLine(Gpm()).apply {
             out = PrintWriter(StringWriter())
         }
+
+
     }
 
     @Test
     fun `Uninstall installed dependency`() {
+
         // Install dependency
         val installExitCode = cmd.execute("install", "okhttp")
         installExitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
@@ -33,17 +36,21 @@ class UninstallTest {
 
     @Test
     fun `Uninstall dependency which is manually added`() {
-
+        // Uninstall dep
+        val uninstallExitCode = cmd.execute("uninstall", "robolectric")
+        uninstallExitCode.should.equal(UninstallViewModel.RESULT_NO_DEP_INSTALLED)
     }
 
     @Test
     fun `Uninstall not installed dependency`() {
-
+        val uninstallExitCode = cmd.execute("uninstall", "invalid-library")
+        uninstallExitCode.should.equal(UninstallViewModel.RESULT_NO_DEP_INSTALLED)
     }
 
     @Test
     fun `Uninstall dependency which installed through same dependency name`() {
-
+        val uninstallExitCode = cmd.execute("uninstall", "same-name")
+        uninstallExitCode.should.equal(UninstallViewModel.RESULT_DEP_UNINSTALLED)
     }
 
     @Test
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
index 24c6742..362a169 100644
--- a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
@@ -3,7 +3,6 @@ package com.theapache64.gpm.rules
 import com.theapache64.gpm.di.components.InstallComponent
 import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.di.modules.NetworkModule
-import it.cosenonjaviste.daggermock.DaggerMock
 import it.cosenonjaviste.daggermock.DaggerMockRule
 
 class MyDaggerMockRule : DaggerMockRule<InstallComponent>(
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index 96241f1..40618fd 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -38,7 +38,7 @@ class GradleManagerTest {
             GradleDep.Type.IMP,
             GpmDep(
                 "myArtifact",
-                GradleDep.Type.IMP.keyword,
+                GradleDep.Type.IMP.key,
                 "https://mylib.docs",
                 "jcenter",
                 "https://github.com/userx/myArtifact",
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt
index d9934e9..07a158b 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleUtilsTest.kt
@@ -9,7 +9,7 @@ class GradleUtilsTest {
     fun `Full signature for implementation`() {
 
         val gradleDependency = GradleUtils.getFullSignature(
-            GradleDep.Type.IMP.keyword,
+            GradleDep.Type.IMP.key,
             "org.mockito",
             "mockito",
             "3.3.3"
@@ -24,7 +24,7 @@ class GradleUtilsTest {
     fun `Full signature for testImplementation`() {
 
         val gradleDependency = GradleUtils.getFullSignature(
-            GradleDep.Type.TEST_IMP.keyword,
+            GradleDep.Type.TEST_IMP.key,
             "org.mockito",
             "mockito",
             "3.3.3"
@@ -39,7 +39,7 @@ class GradleUtilsTest {
     fun `Full signature for androidTestImplementation`() {
 
         val gradleDependency = GradleUtils.getFullSignature(
-            GradleDep.Type.AND_TEST_IMP.keyword,
+            GradleDep.Type.AND_TEST_IMP.key,
             "org.mockito",
             "mockito",
             "3.3.3"
diff --git a/src/test/resources/okhttp.mavenrepository.com.html b/src/test/resources/okhttp.mavenrepository.com.html
new file mode 100644
index 0000000..1a085c0
--- /dev/null
+++ b/src/test/resources/okhttp.mavenrepository.com.html
@@ -0,0 +1,61 @@
+
+<!DOCTYPE html><html><head><meta charset="UTF-8"><title>Maven Repository: com.squareup.okhttp3 » okhttp</title><link rel="canonical" href="https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp"/><link rel="shortcut icon" type="image/x-icon" href="/assets/images/7080b8b0f6f48e6fbaffd5f9d85fcc7f-favicon.ico"><link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="MvnRepository"><script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-76305-3', 'auto'); ga('send', 'pageview');
+</script><script type="text/javascript">
+    var enc=encodeURIComponent;window.onerror=function(dsc,p,l,c,e){(new Image()).src="/assets/images/e.gif?v=2&p="+
+        enc(p)+"&l="+l+"&c="+c+"&d="+ enc(dsc)+"&e="+enc(e);if(console){console.error(dsc+"(p: "+p+" l: "+l+"c:"+c+")");}
+        return true;};
+</script></head><body><style>
+    html,body{margin:0;padding:0;height:100%;font-size:12px;font-family:Verdana,Arial,Helvetica,sans-serif;}h1{border-bottom:1px solid lightgray;padding-bottom:0.7em;margin-top:0.2em;font-size:18px;}h2{color:black;font-size:14px;}h3,#tabs{color:#222222;padding:2px 10px;margin-top:10px;font-size:12px;border:1px solid #aaa;}#left h3{border:1px solid #aaa;font-size:12px;margin-top:4px;background:#efefef;color:#175bb0;}#left ul{list-style-type:none;padding:0;margin:0 0 10px 0;}#left li{padding-left:7px;padding-top:4px;padding-bottom:0;border-left:4px solid #bbb;font-size:12px;margin:1px;vertical-align:text-bottom;min-height:20px;height:0.8em;}#left li.selected{background:#d7e6f6;}ul.repositories{list-style-type:none;padding:0;margin:0 0 10px 0;text-align:left;}ul.repositories li{padding-left:7px;padding-top:4px;padding-bottom:0;font-size:12px;margin:1px;vertical-align:text-bottom;min-height:20px;height:0.8em;}#header{height:48px;border-top:2px solid #ddd;border-bottom:1px solid #bbb;background:#eee;background:linear-gradient(to bottom,#fff,#eee);}#logo{float:left;padding:3px 13px;}#logo .sub{font-size:10px;color:#222;}#left{position:absolute;left:0;padding-left:10px;top:65px;width:200px;}#right{padding-left:10px;padding-right:20px;padding-top:5px;position:absolute;right:0;top:55px;width:290px;}#maincontent{margin-left:221px;margin-right:321px;padding:9px 10px 10px;min-height:1600px;border-left:1px solid #dfdfdf;border-right:1px solid #dfdfdf;}#footer{text-align:center;clear:both;background-color:#F5F5F5;padding:10px;}a{text-decoration:none;color:#175bb0;}a:hover{text-decoration:underline;}#logo a:hover{text-decoration:none;}#navigation{position:absolute;top:22px;right:45px;font-weight:bold;font-size:13px;color:gray;}#search{padding:9px 7px 8px 15px;position:relative;margin-left:221px;margin-right:321px;}#search input{background:#fff;border:1px solid darkgray;border-radius:4px;font-size:14px;height:28px;padding-right:6px;padding-left:6px;}#search .textfield{width:60%;color:#666;outline:0;border:1px solid #999;text-shadow:none;}#search .button{margin-left:10px;padding:0 15px;height:28px;}ul.search-nav{margin:25px 0 20px 0;padding:0;list-style-type:none;text-align:center;}ul.search-nav li{display:inline;background-color:#1857ad;color:#fff;padding:.2em 0;margin:.2em;}.search-nav a{text-decoration:none;color:#fff;padding:.2em 0.8em;}.search-nav span{padding:.2em 0.8em;}.search-nav li.current{background-color:#a9a9a9;}.adbox{margin-top:10px;}.snippet{font-size:12px;}.vbtn{background:#FAFAFF;border:1px solid #ddd;border-radius:4px;border-spacing:0;box-shadow:1px 1px 1px #eee;padding:1px 4px;white-space:nowrap;vertical-align:baseline;}.vsc{background:#FAFAFF;border-radius:4px;border-spacing:0;padding:1px 4px;white-space:nowrap;vertical-align:baseline;line-height:150%;}hr{border-top:1px solid #a9a9a9;}.rb{display:block;background:orange;height:5px;box-shadow:1px 1px 1px #999;}.pb{width:100%;}.pbv{background:#dadada;color:#356cb0;height:5px;}.beta{background:#FAEAEF;}.alpha{background:#FFCCDD;}.candidate{background:#FAEAEF;}.sidebar{background-color:#f5f5f5;}.t1{font-size:12px;color:#7b94b0;}.t2{font-size:13px;color:#6a89b0;}.t3{font-size:14px;color:#5880b0;}.t4{font-size:16px;color:#4676b0;}.t5{font-size:18px;color:#356cb0;}.t6{font-size:19px;color:#2363b0;}.t7{font-size:24px;color:#1259b0;}.cnt{font-style:normal;font-size:11px;padding:1px 2px;margin-left:5px;background-color:#efefef;color:#444;border-radius:3px;}.b{display:inline-block;font-style:normal;font-size:11px;padding:2px 4px;margin:1px;background-color:#d3d3d3;color:white;}.tag{border-left:4px solid #478be0;background-color:#175bb0;}.c{text-align:center;background-color:#df2d4f;}.lic{text-align:center;background-color:#5285c5;}.bookimg{box-shadow:4px 4px 2px #888888;}.breadcrumb{padding:6px 0 10px 0;font-size:13px;}.gridcontainer{overflow-x:scroll;}table.grid{border-spacing:1px;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:12px;background-color:#e1e1e1;color:#222;}table.grid td,th{padding:4px;}table.grid tbody th{font-weight:bold;}table.grid tbody tr{background-color:#FFF;text-align:left;}table.grid tbody tr td{background:#FFF;border:1px solid #FFF;}.im{border-bottom:1px solid #ddd;padding-bottom:1.5em;font-size:13px;}.im-category{color:#555;margin:10px 0;}.im-usage{color:#444;background:#eeeeee;padding:1px 5px;border-radius:2px;float:right;font-weight:normal;font-size:12px;}.im-lic{padding:1px 5px;float:right;font-weight:normal;font-size:12px;}a:hover.im-usage{text-decoration:none;}.im-title{font-size:13px;margin-bottom:0.8em}.im-title a{color:black;}h2.im-title{margin-top:0.6em;margin-bottom:0.5em;}.im-subtitle{color:#999;font-size:95%;margin:0;}.im-header{margin-top:1.5em;margin-left:65px;}.im-description{margin-top:1em;margin-left:65px;}.im-logo{float:left;margin-right:1em;border-radius:4px;padding:2px;box-shadow:1px 1px 1px 1px #ccc;}.im-link{color:#006a00;}.im-n{color:#777777;font-weight:normal}.version-section{padding-bottom:1.5em;}
+</style><div id="page"><div id="header" style="text-align:center"><div id="logo"><a href="/"><img src="/assets/images/392dffac024b9632664e6f2c0cac6fe5-logo.png" border="0" width="195" height="39" alt="MavenRepository"/></a></div><div id="search"><form action="/search"><input class="textfield" placeholder="Search for groups, artifacts, categories" type="text" id="query" size="45" maxlength="100" name="q" value="" onfocus="var cur=this.value; this.value=''; this.value=cur" autofocus/><input class="button" type="submit" value="Search"/></form></div><div id="navigation"><a href="/open-source"><b>Categories</b></a> |
+    <a href="/popular">Popular</a> |
+    <a href="mailto:info@mvnrepository.com">Contact Us</a></div><div style ="clear: both;"></div></div><div id="left"><div><h3><a href="/repos">
+    Indexed Artifacts (17.0M)</a></h3><div style="text-align: center"><a href="/repos"><img src="/assets/images/ef5169e8ad14e18dda46b95d019149a0-growth.png" width="170" height="120"/></a></div></div><div><h3><a href="/open-source">Popular Categories</a></h3><ul class="categories"><li ><a href="/open-source/aop-programming">Aspect Oriented</a></li><li ><a href="/open-source/actor-frameworks">Actor Frameworks</a></li><li ><a href="/open-source/application-metrics">Application Metrics</a></li><li ><a href="/open-source/build-tools">Build Tools</a></li><li ><a href="/open-source/bytecode-libraries">Bytecode Libraries</a></li><li ><a href="/open-source/command-line-parsers">Command Line Parsers</a></li><li ><a href="/open-source/cache-implementations">Cache Implementations</a></li><li ><a href="/open-source/cloud-computing-integration">Cloud Computing</a></li><li ><a href="/open-source/code-analyzers">Code Analyzers</a></li><li ><a href="/open-source/collections">Collections</a></li><li ><a href="/open-source/config-libraries">Configuration Libraries</a></li><li ><a href="/open-source/core-utilities">Core Utilities</a></li><li ><a href="/open-source/date-time-utilities">Date and Time Utilities</a></li><li ><a href="/open-source/dependency-injection">Dependency Injection</a></li><li ><a href="/open-source/embedded-sql-databases">Embedded SQL Databases</a></li><li ><a href="/open-source/html-parsers">HTML Parsers</a></li><li ><a href="/open-source/http-clients">HTTP Clients</a></li><li ><a href="/open-source/io-utilities">I/O Utilities</a></li><li ><a href="/open-source/jdbc-extensions">JDBC Extensions</a></li><li ><a href="/open-source/jdbc-pools">JDBC Pools</a></li><li ><a href="/open-source/jpa-implementations">JPA Implementations</a></li><li ><a href="/open-source/json-libraries">JSON Libraries</a></li><li ><a href="/open-source/jvm-languages">JVM Languages</a></li><li ><a href="/open-source/logging-frameworks">Logging Frameworks</a></li><li ><a href="/open-source/logging-bridges">Logging Bridges</a></li><li ><a href="/open-source/mail-clients">Mail Clients</a></li><li ><a href="/open-source/maven-plugins">Maven Plugins</a></li><li ><a href="/open-source/mocking">Mocking</a></li><li ><a href="/open-source/orm">Object/Relational Mapping</a></li><li ><a href="/open-source/pdf-libraries">PDF Libraries</a></li><li><a href="/open-source"><b>Top Categories</b></a></li></ul></div></div><div id="maincontent"><div class="breadcrumb"><a href="/">Home</a> » <a href="/artifact/com.squareup.okhttp3">com.squareup.okhttp3</a> » okhttp
+</div><div class="im" style="border-bottom: none;
+padding-bottom: 0.5em"><a href="/artifact/com.squareup.okhttp3/okhttp"><picture><source type="image/webp" srcset="/img/87194522d7d78824b62cfd048357fd3e"><img class="im-logo" width="48" height="48" src="/img/bdae79cf4c7bf53fbc930ed04f17800d"/></picture></a><div class="im-header" style="margin-top: 0"><h2 class="im-title" style="font-size: 130%"><a href="okhttp">OkHttp</a></h2><p class="im-subtitle"></p></div><div class="im-description">
+    Square’s meticulous HTTP client for Java and Kotlin.
+</div></div><br/><table class="grid" width="100%"><tr><th>License</th><td><span class="b lic">Apache 2.0</span></td></tr><tr><th>Categories</th><td><a href="/open-source/http-clients" class="b c">HTTP Clients</a></td></tr><tr><th>Tags</th><td><a href="/tags/http" class="b tag">http</a><a href="/tags/client" class="b tag">client</a></td></tr><tr><th style="width: 12em;">Used By</th><td><a href="/artifact/com.squareup.okhttp3/okhttp/usages"><b>4,584
+    artifacts</b></a></td></tr></table><br/><style>
+    .vq {
+        padding: 2px;
+    }
+</style><div><style>
+    .tabs,.tab_container{padding:0}.tabs li{position:relative;float:left;list-style:none;padding-top:7px;}.tabs li a{padding:5px 10px 0 10px;margin-right:2px;border-radius:4px 4px 0 0;border:1px solid gray;border-bottom-color:transparent;}.tabs .active a,.tabs .active a:hover{background-color:#fafafa;border:1px solid gray;border-bottom-color:transparent;cursor:default;text-decoration:none;}.tab_container{clear:both;background-color:#fafafa;}.tab_content{display:none;padding:10px;border:1px solid gray;list-style:none;}.tab_container .active{display:block;}.msg{text-align:center;font-weight:bold;border:2px solid #fff0f0;padding:5px;margin-top:5px;color:red;background-color:#fff8f8;}
+</style><div id="snippets"><ul class="tabs"><li
+        class="active"><a href="/artifact/com.squareup.okhttp3/okhttp">Central
+    (64)</a></li><li ><a href="/artifact/com.squareup.okhttp3/okhttp?repo=redhat-ga">Redhat GA
+    (7)</a></li><li ><a href="/artifact/com.squareup.okhttp3/okhttp?repo=icm">ICM
+    (1)</a></li></ul><div class="tab_container"><div class="tab_content active"><div class="gridcontainer"><table class="grid versions" width="100%"><thead><tr><th rowspan="2" style="width: 1em"></th><th align="center">Version</th><th align="center" style="width: 10em;">Repository</th><th align="center" style="width: 10em;">Usages</th><th align="center" style="width: 10em;">Date</th></tr></thead><tbody><tr><td rowspan="2"><div><b>4.6</b>.x</div></td><td><a href="okhttp/4.6.0" class="vbtn release">4.6.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.6.0/usages">20</a><span class="rb" style="width: 7px;"></span></td><td>Apr, 2020</td></tr></tbody><tbody><tr><td rowspan="3"><div><b>4.5</b>.x</div></td><td><a href="okhttp/4.5.0" class="vbtn release">4.5.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.5.0/usages">82</a><span class="rb" style="width: 8px;"></span></td><td>Apr, 2020</td></tr><tr><td><a href="okhttp/4.5.0-RC1" class="vbtn release candidate">4.5.0-RC1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.5.0-RC1/usages">9</a><span class="rb" style="width: 7px;"></span></td><td>Mar, 2020</td></tr></tbody><tbody><tr><td rowspan="3"><div><b>4.4</b>.x</div></td><td><a href="okhttp/4.4.1" class="vbtn release">4.4.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.4.1/usages">77</a><span class="rb" style="width: 8px;"></span></td><td>Mar, 2020</td></tr><tr><td><a href="okhttp/4.4.0" class="vbtn release">4.4.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.4.0/usages">107</a><span class="rb" style="width: 9px;"></span></td><td>Feb, 2020</td></tr></tbody><tbody><tr><td rowspan="3"><div><b>4.3</b>.x</div></td><td><a href="okhttp/4.3.1" class="vbtn release">4.3.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.3.1/usages">108</a><span class="rb" style="width: 9px;"></span></td><td>Jan, 2020</td></tr><tr><td><a href="okhttp/4.3.0" class="vbtn release">4.3.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.3.0/usages">40</a><span class="rb" style="width: 7px;"></span></td><td>Dec, 2019</td></tr></tbody><tbody><tr><td rowspan="4"><div><b>4.2</b>.x</div></td><td><a href="okhttp/4.2.2" class="vbtn release">4.2.2</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.2.2/usages">188</a><span class="rb" style="width: 11px;"></span></td><td>Oct, 2019</td></tr><tr><td><a href="okhttp/4.2.1" class="vbtn release">4.2.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.2.1/usages">41</a><span class="rb" style="width: 7px;"></span></td><td>Oct, 2019</td></tr><tr><td><a href="okhttp/4.2.0" class="vbtn release">4.2.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.2.0/usages">77</a><span class="rb" style="width: 8px;"></span></td><td>Sep, 2019</td></tr></tbody><tbody><tr><td rowspan="3"><div><b>4.1</b>.x</div></td><td><a href="okhttp/4.1.1" class="vbtn release">4.1.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.1.1/usages">43</a><span class="rb" style="width: 7px;"></span></td><td>Sep, 2019</td></tr><tr><td><a href="okhttp/4.1.0" class="vbtn release">4.1.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.1.0/usages">90</a><span class="rb" style="width: 8px;"></span></td><td>Aug, 2019</td></tr></tbody><tbody><tr><td rowspan="8"><div><b>4.0</b>.x</div></td><td><a href="okhttp/4.0.1" class="vbtn release">4.0.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.0.1/usages">79</a><span class="rb" style="width: 8px;"></span></td><td>Jul, 2019</td></tr><tr><td><a href="okhttp/4.0.0" class="vbtn release">4.0.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.0.0/usages">55</a><span class="rb" style="width: 8px;"></span></td><td>Jun, 2019</td></tr><tr><td><a href="okhttp/4.0.0-RC3" class="vbtn release candidate">4.0.0-RC3</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.0.0-RC3/usages">7</a><span class="rb" style="width: 7px;"></span></td><td>Jun, 2019</td></tr><tr><td><a href="okhttp/4.0.0-RC2" class="vbtn release candidate">4.0.0-RC2</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.0.0-RC2/usages">7</a><span class="rb" style="width: 7px;"></span></td><td>Jun, 2019</td></tr><tr><td><a href="okhttp/4.0.0-RC1" class="vbtn release candidate">4.0.0-RC1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.0.0-RC1/usages">13</a><span class="rb" style="width: 7px;"></span></td><td>Jun, 2019</td></tr><tr><td><a href="okhttp/4.0.0-alpha02" class="vbtn alpha">4.0.0-alpha02</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.0.0-alpha02/usages">8</a><span class="rb" style="width: 7px;"></span></td><td>May, 2019</td></tr><tr><td><a href="okhttp/4.0.0-alpha01" class="vbtn alpha">4.0.0-alpha01</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/4.0.0-alpha01/usages">8</a><span class="rb" style="width: 7px;"></span></td><td>May, 2019</td></tr></tbody><tbody><tr><td rowspan="10"><div><b>3.14</b>.x</div></td><td><a href="okhttp/3.14.8" class="vbtn release">3.14.8</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.8/usages">15</a><span class="rb" style="width: 7px;"></span></td><td>Apr, 2020</td></tr><tr><td><a href="okhttp/3.14.7" class="vbtn release">3.14.7</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.7/usages">58</a><span class="rb" style="width: 8px;"></span></td><td>Feb, 2020</td></tr><tr><td><a href="okhttp/3.14.6" class="vbtn release">3.14.6</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.6/usages">51</a><span class="rb" style="width: 8px;"></span></td><td>Jan, 2020</td></tr><tr><td><a href="okhttp/3.14.5" class="vbtn release">3.14.5</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.5/usages">17</a><span class="rb" style="width: 7px;"></span></td><td>Jan, 2020</td></tr><tr><td><a href="okhttp/3.14.4" class="vbtn release">3.14.4</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.4/usages">69</a><span class="rb" style="width: 8px;"></span></td><td>Sep, 2019</td></tr><tr><td><a href="okhttp/3.14.3" class="vbtn release">3.14.3</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.3/usages">33</a><span class="rb" style="width: 7px;"></span></td><td>Sep, 2019</td></tr><tr><td><a href="okhttp/3.14.2" class="vbtn release">3.14.2</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.2/usages">207</a><span class="rb" style="width: 11px;"></span></td><td>May, 2019</td></tr><tr><td><a href="okhttp/3.14.1" class="vbtn release">3.14.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.1/usages">141</a><span class="rb" style="width: 10px;"></span></td><td>Apr, 2019</td></tr><tr><td><a href="okhttp/3.14.0" class="vbtn release">3.14.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.14.0/usages">129</a><span class="rb" style="width: 9px;"></span></td><td>Mar, 2019</td></tr></tbody><tbody><tr><td rowspan="3"><div><b>3.13</b>.x</div></td><td><a href="okhttp/3.13.1" class="vbtn release">3.13.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.13.1/usages">164</a><span class="rb" style="width: 10px;"></span></td><td>Feb, 2019</td></tr><tr><td><a href="okhttp/3.13.0" class="vbtn release">3.13.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.13.0/usages">16</a><span class="rb" style="width: 7px;"></span></td><td>Feb, 2019</td></tr></tbody><tbody><tr><td rowspan="13"><div><b>3.12</b>.x</div></td><td><a href="okhttp/3.12.11" class="vbtn release">3.12.11</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.11/usages">16</a><span class="rb" style="width: 7px;"></span></td><td>Apr, 2020</td></tr><tr><td><a href="okhttp/3.12.10" class="vbtn release">3.12.10</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.10/usages">35</a><span class="rb" style="width: 7px;"></span></td><td>Feb, 2020</td></tr><tr><td><a href="okhttp/3.12.9" class="vbtn release">3.12.9</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.9/usages">14</a><span class="rb" style="width: 7px;"></span></td><td>Feb, 2020</td></tr><tr><td><a href="okhttp/3.12.8" class="vbtn release">3.12.8</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.8/usages">26</a><span class="rb" style="width: 7px;"></span></td><td>Jan, 2020</td></tr><tr><td><a href="okhttp/3.12.7" class="vbtn release">3.12.7</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.7/usages">16</a><span class="rb" style="width: 7px;"></span></td><td>Jan, 2020</td></tr><tr><td><a href="okhttp/3.12.6" class="vbtn release">3.12.6</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.6/usages">51</a><span class="rb" style="width: 8px;"></span></td><td>Sep, 2019</td></tr><tr><td><a href="okhttp/3.12.5" class="vbtn release">3.12.5</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.5/usages">25</a><span class="rb" style="width: 7px;"></span></td><td>Sep, 2019</td></tr><tr><td><a href="okhttp/3.12.4" class="vbtn release">3.12.4</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.4/usages">20</a><span class="rb" style="width: 7px;"></span></td><td>Sep, 2019</td></tr><tr><td><a href="okhttp/3.12.3" class="vbtn release">3.12.3</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.3/usages">70</a><span class="rb" style="width: 8px;"></span></td><td>May, 2019</td></tr><tr><td><a href="okhttp/3.12.2" class="vbtn release">3.12.2</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.2/usages">66</a><span class="rb" style="width: 8px;"></span></td><td>Mar, 2019</td></tr><tr><td><a href="okhttp/3.12.1" class="vbtn release">3.12.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.1/usages">278</a><span class="rb" style="width: 13px;"></span></td><td>Dec, 2018</td></tr><tr><td><a href="okhttp/3.12.0" class="vbtn release">3.12.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.12.0/usages">295</a><span class="rb" style="width: 13px;"></span></td><td>Nov, 2018</td></tr></tbody><tbody><tr><td rowspan="2"><div><b>3.11</b>.x</div></td><td><a href="okhttp/3.11.0" class="vbtn release">3.11.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.11.0/usages">593</a><span class="rb" style="width: 19px;"></span></td><td>Jul, 2018</td></tr></tbody><tbody><tr><td rowspan="2"><div><b>3.10</b>.x</div></td><td><a href="okhttp/3.10.0" class="vbtn release">3.10.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.10.0/usages">624</a><span class="rb" style="width: 20px;"></span></td><td>Feb, 2018</td></tr></tbody><tbody><tr><td rowspan="3"><div><b>3.9</b>.x</div></td><td><a href="okhttp/3.9.1" class="vbtn release">3.9.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.9.1/usages">402</a><span class="rb" style="width: 15px;"></span></td><td>Nov, 2017</td></tr><tr><td><a href="okhttp/3.9.0" class="vbtn release">3.9.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.9.0/usages">501</a><span class="rb" style="width: 17px;"></span></td><td>Sep, 2017</td></tr></tbody><tbody><tr><td rowspan="3"><div><b>3.8</b>.x</div></td><td><a href="okhttp/3.8.1" class="vbtn release">3.8.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.8.1/usages">427</a><span class="rb" style="width: 16px;"></span></td><td>Jun, 2017</td></tr><tr><td><a href="okhttp/3.8.0" class="vbtn release">3.8.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.8.0/usages">270</a><span class="rb" style="width: 12px;"></span></td><td>May, 2017</td></tr></tbody><tbody><tr><td rowspan="2"><div><b>3.7</b>.x</div></td><td><a href="okhttp/3.7.0" class="vbtn release">3.7.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.7.0/usages">199</a><span class="rb" style="width: 11px;"></span></td><td>Apr, 2017</td></tr></tbody><tbody><tr><td rowspan="2"><div><b>3.6</b>.x</div></td><td><a href="okhttp/3.6.0" class="vbtn release">3.6.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.6.0/usages">608</a><span class="rb" style="width: 20px;"></span></td><td>Jan, 2017</td></tr></tbody><tbody><tr><td rowspan="2"><div><b>3.5</b>.x</div></td><td><a href="okhttp/3.5.0" class="vbtn release">3.5.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.5.0/usages">211</a><span class="rb" style="width: 11px;"></span></td><td>Dec, 2016</td></tr></tbody><tbody><tr><td rowspan="5"><div><b>3.4</b>.x</div></td><td><a href="okhttp/3.4.2" class="vbtn release">3.4.2</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.4.2/usages">151</a><span class="rb" style="width: 10px;"></span></td><td>Nov, 2016</td></tr><tr><td><a href="okhttp/3.4.1" class="vbtn release">3.4.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.4.1/usages">448</a><span class="rb" style="width: 16px;"></span></td><td>Jul, 2016</td></tr><tr><td><a href="okhttp/3.4.0" class="vbtn release">3.4.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.4.0/usages">20</a><span class="rb" style="width: 7px;"></span></td><td>Jul, 2016</td></tr><tr><td><a href="okhttp/3.4.0-RC1" class="vbtn release candidate">3.4.0-RC1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.4.0-RC1/usages">17</a><span class="rb" style="width: 7px;"></span></td><td>Jul, 2016</td></tr></tbody><tbody><tr><td rowspan="3"><div><b>3.3</b>.x</div></td><td><a href="okhttp/3.3.1" class="vbtn release">3.3.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.3.1/usages">180</a><span class="rb" style="width: 10px;"></span></td><td>May, 2016</td></tr><tr><td><a href="okhttp/3.3.0" class="vbtn release">3.3.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.3.0/usages">42</a><span class="rb" style="width: 7px;"></span></td><td>May, 2016</td></tr></tbody><tbody><tr><td rowspan="2"><div><b>3.2</b>.x</div></td><td><a href="okhttp/3.2.0" class="vbtn release">3.2.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.2.0/usages">304</a><span class="rb" style="width: 13px;"></span></td><td>Feb, 2016</td></tr></tbody><tbody><tr><td rowspan="4"><div><b>3.1</b>.x</div></td><td><a href="okhttp/3.1.2" class="vbtn release">3.1.2</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.1.2/usages">74</a><span class="rb" style="width: 8px;"></span></td><td>Feb, 2016</td></tr><tr><td><a href="okhttp/3.1.1" class="vbtn release">3.1.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.1.1/usages">20</a><span class="rb" style="width: 7px;"></span></td><td>Feb, 2016</td></tr><tr><td><a href="okhttp/3.1.0" class="vbtn release">3.1.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.1.0/usages">13</a><span class="rb" style="width: 7px;"></span></td><td>Feb, 2016</td></tr></tbody><tbody><tr><td rowspan="4"><div><b>3.0</b>.x</div></td><td><a href="okhttp/3.0.1" class="vbtn release">3.0.1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.0.1/usages">96</a><span class="rb" style="width: 9px;"></span></td><td>Jan, 2016</td></tr><tr><td><a href="okhttp/3.0.0" class="vbtn release">3.0.0</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.0.0/usages">17</a><span class="rb" style="width: 7px;"></span></td><td>Jan, 2016</td></tr><tr><td><a href="okhttp/3.0.0-RC1" class="vbtn release candidate">3.0.0-RC1</a></td><td><a class="b lic" href="/repos/central">Central</a></td><td><a href="okhttp/3.0.0-RC1/usages">40</a><span class="rb" style="width: 7px;"></span></td><td>Jan, 2016</td></tr></tbody></table></div></div></div></div></div></div><div id="right"><style>
+    #carbonads{position:relative;display:flex;width:300px;height:250px;background-color:#fff;box-shadow:inset 0 0 1px 1px hsla(0,0%,0%,.15);text-align:center;font-family:-apple-system,BlinkMacSystemFont,&quot;Segoe UI&quot;,Roboto,Oxygen-Sans,Ubuntu,Cantarell,&quot;Helvetica Neue&quot;,Helvetica,Arial,sans-serif;justify-content:center;align-items:center;}#carbonads a{color:#111;text-decoration:none;}#carbonads a:hover{color:#111;}#carbonads span{display:block;overflow:hidden;}.carbon-img{display:block;margin:0 0 8px;line-height:1;}.carbon-img img{max-width:150px !important;width:150px;height:auto;}.carbon-text{display:block;margin-bottom:8px;padding:0 10px;font-weight:500;font-size:16px;line-height:1.35;}.carbon-poweredby{position:absolute;right:10px;bottom:10px;display:block;padding:5px 6px;border-radius:2.5px;background-color:hsl(246,93%,69%);color:#fff !important;text-transform:uppercase;letter-spacing:.5px;font-weight:600;font-size:8px;line-height:1;}
+</style><div id="carbon-block"></div><script>
+    try {
+        fetch(new Request("https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js", { method: 'HEAD', mode: 'no-cors' })).then(function(response) {
+            return true;
+        }).catch(function(e) {
+            var carbonScript = document.createElement("script");
+            carbonScript.src = "//cdn.carbonads.com/carbon.js?serve=CE7DV2QU&placement=mvnrepositorycom";
+            carbonScript.id = "_carbonads_js";
+            document.getElementById("carbon-block").appendChild(carbonScript);
+        });
+    } catch (error) {
+        console.log(error);
+    }
+</script><div id="ad1" class="adbox"><script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><!-- mvn-right-big --><ins class="adsbygoogle" style="display:inline-block;width:300px;height:600px" data-ad-client="ca-pub-1185571689816607" data-ad-slot="6886944692"></ins><script> (adsbygoogle = window.adsbygoogle || []).push({}); </script></div><div class="adbox"><script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:300px;height:250px" data-ad-client="ca-pub-1185571689816607" data-ad-slot="4011495181"></ins><script> (adsbygoogle = window.adsbygoogle || []).push({}); </script></div><div style="text-align: center"><h3><a href="/repos">Indexed Repositories (1277)</a></h3><ul class="repositories"><li><a href="/repos/central"><div class="pb"><span>Central</span><div class="pbv" style="width:100%"></div></div></a></li><li><a href="/repos/sonatype-releases"><div class="pb"><span>Sonatype</span><div class="pbv" style="width:41%"></div></div></a></li><li><a href="/repos/springio-plugins-release"><div class="pb"><span>Spring Plugins</span><div class="pbv" style="width:28%"></div></div></a></li><li><a href="/repos/spring-libs-milestone"><div class="pb"><span>Spring Lib M</span><div class="pbv" style="width:25%"></div></div></a></li><li><a href="/repos/hortonworks-releases"><div class="pb"><span>Hortonworks</span><div class="pbv" style="width:20%"></div></div></a></li><li><a href="/repos/atlassian-public"><div class="pb"><span>Atlassian</span><div class="pbv" style="width:13%"></div></div></a></li><li><a href="/repos/jcenter"><div class="pb"><span>JCenter</span><div class="pbv" style="width:9%"></div></div></a></li><li><a href="/repos/jboss-ea"><div class="pb"><span>JBossEA</span><div class="pbv" style="width:8%"></div></div></a></li><li><a href="/repos/jboss-releases"><div class="pb"><span>JBoss Releases</span><div class="pbv" style="width:5%"></div></div></a></li><li><a href="/repos/wso2-releases"><div class="pb"><span>WSO2 Releases</span><div class="pbv" style="width:4%"></div></div></a></li></ul></div><div style="border-top: 1px solid gray; padding-top: 1em"></div><div style="text-align:center"><h3><a href="/tags">Popular Tags</a></h3><script type="text/javascript">
+    var tags = ['android','apache','api','application','assets','aws','build','build-system','camel','client','clojure','cloud','config','data','database','eclipse','example','extension','framework','github','gradle','groovy','http','io','jboss','library','logging','maven','model','module','osgi','persistence','platform','plugin','repository','rest','rlang','scala','sdk','security','server','service','spring','starter','streaming','testing','tools','ui','web','webapp'];
+    var sizes = [5,5,5,3,4,1,5,5,1,4,5,3,2,2,3,4,4,1,1,5,4,4,1,5,3,3,2,4,1,3,2,2,1,5,1,2,2,2,3,1,4,3,4,2,1,4,2,3,5,3];
+    for (var i in tags) {
+        document.write("<a href='/tags/" + tags[i] + "' class='t" + sizes[i] + "'>" + tags[i] + "</a>\n");
+    }
+</script><br/><br/></div><br/><div style="font-size: 13px; border-top: 1px solid gray; text-align: center; padding-top: 1em">
+    Web site developed by <a href="https://twitter.com/frodriguez">@frodriguez</a><br/><br/>
+    Powered by:
+    <a href="/artifact/org.scala-lang">Scala</a>,
+    <a href="/artifact/com.typesafe.play">Play</a>,
+    <a href="/artifact/org.apache.spark">Spark</a>,
+    <a href="/artifact/com.typesafe.akka">Akka</a> and
+    <a href="/artifact/org.apache.cassandra">Cassandra</a></div></div></div><div id="footer">
+    Copyright &copy; 2006-2020 MvnRepository. All rights reserved.<br/><span style="text-align: center">Web site developed by <a href="https://twitter.com/frodriguez">@frodriguez</a></span><br/><a href="mailto:info@mvnrepository.com">Contact Us</a></div><script src="/assets/javascripts/729ad6b0945dc6b8bdb211b062b33385-perf.js" type="text/javascript" async></script></body></html>
\ No newline at end of file
diff --git a/assets/sample.build.gradle b/src/test/resources/sample.build.gradle
similarity index 97%
rename from assets/sample.build.gradle
rename to src/test/resources/sample.build.gradle
index 7efb625..1441071 100644
--- a/assets/sample.build.gradle
+++ b/src/test/resources/sample.build.gradle
@@ -125,6 +125,9 @@ dependencies {
     testImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
 
+    implementation 'com.squareup.okhttp3:same-name:1.1.1'
+    implementation 'com.squareup.okhttp3:another:1.1.1'
+
     // Espresso
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
     androidTestImplementation('com.schibsted.spain:barista:3.4.0') {

From db28d4011fcf5c139e1166e47d0a956fad1f894d Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Wed, 6 May 2020 09:13:18 +0530
Subject: [PATCH 18/24] =?UTF-8?q?=E2=97=80=EF=B8=8F=20backup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gpm/core/TransactionManager.kt            | 30 +++++++++++++------
 .../gpm/di/modules/GradleModule.kt            |  2 +-
 .../gpm/commands/subcommands/InstallTest.kt   |  2 ++
 .../subcommands/uninstall/UninstallTest.kt    |  6 ++--
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
index 9b5ec0d..4364fdf 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
@@ -60,7 +60,7 @@ class TransactionManager @Inject constructor(
     }
 
     private fun isDuplicate(installedName: String, type: GradleDep.Type, newGpmDep: GpmDep): Boolean {
-        return getData().deps.find {
+        return getData()?.deps?.find {
             it.installedName == installedName &&
                     it.type == type.key &&
                     it.gpmDep.artifactId == newGpmDep.artifactId &&
@@ -71,7 +71,7 @@ class TransactionManager @Inject constructor(
 
     private fun getLastDepAdded(): GpmFileData.AddedDep? {
         return try {
-            getData().deps.lastOrNull()
+            getData()?.deps?.lastOrNull()
         } catch (e: FileNotFoundException) {
             null
         }
@@ -83,20 +83,32 @@ class TransactionManager @Inject constructor(
     }
 
     fun getInstalled(type: String, depName: String): List<GpmFileData.AddedDep> {
-        return getData().deps.filter {
+        return getData()?.deps?.filter {
             it.installedName == depName && it.type == type
-        }
+        } ?: listOf()
     }
 
     fun remove(depToRemove: GpmFileData.AddedDep) {
         val data = getData()
-        val isRemoved = data.deps.removeIf { it.id == depToRemove.id }
-        if (isRemoved) {
-            setData(data)
+        if (data != null) {
+            val isRemoved = data.deps.removeIf { it.id == depToRemove.id }
+            if (isRemoved) {
+                setData(data)
+            } else {
+                throw IOException("Failed to remove dependency. Couldn't find dependency with id '${depToRemove.id}'")
+            }
         } else {
-            throw IOException("Failed to remove dependency. Couldn't find dependency with id '${depToRemove.id}'")
+            throw IOException(
+                """
+                Failed to remove dependency. Are you sure you have installed it through gpm?
+            """.trimIndent()
+            )
         }
     }
 
-    private fun getData() = adapter.fromJson(GPM_FILE.readText())!!
+    private fun getData() = try {
+        adapter.fromJson(GPM_FILE.readText())
+    } catch (e: FileNotFoundException) {
+        null
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index 3a80524..0b62835 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -11,7 +11,7 @@ import java.lang.IllegalArgumentException
 
 @Module(includes = [TransactionModule::class])
 class GradleModule(
-    val isDeleteTempFile: Boolean
+    private val isDeleteTempFile: Boolean
 ) {
 
     @Provides
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index 1ce2fb9..506056f 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -94,6 +94,8 @@ class InstallTest {
 
         this.installCmd = CommandLine(install)
         installCmd.out = PrintWriter(StringWriter())
+
+        tempBuildGradle.delete()
     }
 
     @Test
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
index 3a0843f..1ab3579 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
@@ -13,13 +13,13 @@ class UninstallTest {
 
     private lateinit var cmd: CommandLine
 
+
+
     @Before
     fun setUp() {
         this.cmd = CommandLine(Gpm()).apply {
             out = PrintWriter(StringWriter())
         }
-
-
     }
 
     @Test
@@ -49,6 +49,8 @@ class UninstallTest {
 
     @Test
     fun `Uninstall dependency which installed through same dependency name`() {
+
+
         val uninstallExitCode = cmd.execute("uninstall", "same-name")
         uninstallExitCode.should.equal(UninstallViewModel.RESULT_DEP_UNINSTALLED)
     }

From b817de4be5c1f55d166d91e8a08448fde7147bf9 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Wed, 6 May 2020 09:23:57 +0530
Subject: [PATCH 19/24] =?UTF-8?q?=E2=97=80=EF=B8=8F=20backup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gpm/commands/base/BaseCommand.kt          |  6 +++--
 .../commands/subcommands/install/Install.kt   |  6 +++--
 .../subcommands/uninstall/Uninstall.kt        |  4 ++--
 .../gpm/core/TransactionManager.kt            | 24 +++++++++----------
 .../gpm/di/modules/GradleModule.kt            |  8 +++----
 .../gpm/di/modules/TransactionModule.kt       |  4 ++--
 .../com/theapache64/gpm/utils/GpmConfig.kt    |  2 +-
 .../gpm/commands/subcommands/InstallTest.kt   | 14 +++++++----
 .../subcommands/uninstall/UninstallTest.kt    |  1 -
 .../theapache64/gpm/rules/MyDaggerMockRule.kt |  2 +-
 10 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/main/kotlin/com/theapache64/gpm/commands/base/BaseCommand.kt b/src/main/kotlin/com/theapache64/gpm/commands/base/BaseCommand.kt
index ace55fb..99b7b1e 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/base/BaseCommand.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/base/BaseCommand.kt
@@ -5,7 +5,9 @@ import com.theapache64.gpm.utils.InputUtils
 import kotlinx.coroutines.delay
 import java.util.concurrent.Callable
 
-abstract class BaseCommand<T> : Callable<T> {
+abstract class BaseCommand<T>(
+    val isFromTest: Boolean
+) : Callable<T> {
 
     suspend fun chooseIndex(items: List<String>): Int {
 
@@ -16,7 +18,7 @@ abstract class BaseCommand<T> : Callable<T> {
         }
 
         @Suppress("ConstantConditionIf")
-        return if (GpmConfig.IS_DEBUG_MODE) {
+        return if (isFromTest) {
             delay(1000)
             1
         } else {
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
index a3e9076..fe4c4b5 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
@@ -3,6 +3,7 @@ package com.theapache64.gpm.commands.subcommands.install
 import com.theapache64.gpm.commands.base.BaseCommand
 import com.theapache64.gpm.di.components.DaggerInstallComponent
 import com.theapache64.gpm.di.modules.GradleModule
+import com.theapache64.gpm.di.modules.TransactionModule
 import com.theapache64.gpm.utils.GpmConfig
 import com.theapache64.gpm.utils.InputUtils
 import kotlinx.coroutines.delay
@@ -17,7 +18,7 @@ import javax.inject.Singleton
     aliases = ["i"],
     description = ["To install the dependency"]
 )
-class Install : BaseCommand<Int>() {
+class Install(isFromTest: Boolean) : BaseCommand<Int>(isFromTest) {
 
     @CommandLine.Option(
         names = ["-S", "--save"],
@@ -46,7 +47,8 @@ class Install : BaseCommand<Int>() {
     init {
         DaggerInstallComponent
             .builder()
-            .gradleModule(GradleModule(true))
+            .gradleModule(GradleModule(isFromTest = false, isDeleteTempFile = true))
+            .transactionModule(TransactionModule(false))
             .build()
             .inject(this)
     }
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
index bd310d1..9a841bf 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
@@ -13,7 +13,7 @@ import javax.inject.Inject
     aliases = ["u"],
     description = ["To uninstall a dependency"]
 )
-class Uninstall : BaseCommand<Int>() {
+class Uninstall(isFromTest: Boolean) : BaseCommand<Int>(isFromTest) {
 
     @CommandLine.Option(
         names = ["-S", "--save"],
@@ -42,7 +42,7 @@ class Uninstall : BaseCommand<Int>() {
     init {
         DaggerUninstallComponent
             .builder()
-            .gradleModule(GradleModule(false))
+            .gradleModule(GradleModule(isFromTest = false, isDeleteTempFile = false))
             .build()
             .inject(this)
     }
diff --git a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
index 4364fdf..bc72d9d 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
@@ -5,13 +5,13 @@ import com.squareup.moshi.Moshi
 import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import com.theapache64.gpm.models.GpmFileData
-import com.theapache64.gpm.utils.GpmConfig
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
 import javax.inject.Inject
 
 class TransactionManager @Inject constructor(
+    private val isFromTest: Boolean,
     private val moshi: Moshi
 ) {
 
@@ -19,14 +19,12 @@ class TransactionManager @Inject constructor(
         moshi.adapter(GpmFileData::class.java).indent(" ")
     }
 
-    companion object {
-        private val GPM_FILE by lazy {
-            @Suppress("ConstantConditionIf")
-            if (GpmConfig.IS_DEBUG_MODE) {
-                File("src/test/resources/temp.gpm.json")
-            } else {
-                File("gpm.json")
-            }
+    private val gpmFile by lazy {
+        @Suppress("ConstantConditionIf")
+        if (isFromTest) {
+            File("src/test/resources/temp.gpm.json")
+        } else {
+            File("gpm.json")
         }
     }
 
@@ -48,10 +46,10 @@ class TransactionManager @Inject constructor(
             installedName,
             newGpmDep
         )
-        val newFileData = if (!GPM_FILE.exists()) {
+        val newFileData = if (!gpmFile.exists()) {
             GpmFileData(mutableListOf(depToStore))
         } else {
-            val gpmFileData = adapter.fromJson(GPM_FILE.readText())
+            val gpmFileData = adapter.fromJson(gpmFile.readText())
             gpmFileData!!.deps.add(depToStore)
             gpmFileData
         }
@@ -79,7 +77,7 @@ class TransactionManager @Inject constructor(
 
     private fun setData(newFileData: GpmFileData) {
         val gpmFileDataJson = adapter.toJson(newFileData)
-        GPM_FILE.writeText(gpmFileDataJson)
+        gpmFile.writeText(gpmFileDataJson)
     }
 
     fun getInstalled(type: String, depName: String): List<GpmFileData.AddedDep> {
@@ -107,7 +105,7 @@ class TransactionManager @Inject constructor(
     }
 
     private fun getData() = try {
-        adapter.fromJson(GPM_FILE.readText())
+        adapter.fromJson(gpmFile.readText())
     } catch (e: FileNotFoundException) {
         null
     }
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index 0b62835..e15bb3a 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -1,16 +1,14 @@
 package com.theapache64.gpm.di.modules
 
-import com.squareup.moshi.Moshi
 import com.theapache64.gpm.core.TransactionManager
-import com.theapache64.gpm.utils.GpmConfig
 import com.theapache64.gpm.core.gm.GradleManager
 import dagger.Module
 import dagger.Provides
 import java.io.File
-import java.lang.IllegalArgumentException
 
 @Module(includes = [TransactionModule::class])
 class GradleModule(
+    private val isFromTest: Boolean,
     private val isDeleteTempFile: Boolean
 ) {
 
@@ -18,7 +16,7 @@ class GradleModule(
     fun gradleFile(): File {
 
         @Suppress("ConstantConditionIf")
-        return if (GpmConfig.IS_DEBUG_MODE) {
+        return if (isFromTest) {
 
             val tempGradleFile = File("src/test/resources/temp.build.gradle")
 
@@ -31,8 +29,10 @@ class GradleModule(
             tempGradleFile
 
         } else {
+
             val androidGradleFile = File("app/build.gradle")
             val jvmGradleFile = File("build.gradle")
+
             when {
                 androidGradleFile.exists() -> {
                     // android project
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
index 5047cb3..6ee7c0f 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
@@ -6,9 +6,9 @@ import dagger.Module
 import dagger.Provides
 
 @Module(includes = [MoshiModule::class])
-class TransactionModule {
+class TransactionModule(private val isFromTest: Boolean) {
     @Provides
     fun provideTransactionManager(moshi: Moshi): TransactionManager {
-        return TransactionManager(moshi)
+        return TransactionManager(isFromTest, moshi)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/utils/GpmConfig.kt b/src/main/kotlin/com/theapache64/gpm/utils/GpmConfig.kt
index 05f6813..2b8d022 100644
--- a/src/main/kotlin/com/theapache64/gpm/utils/GpmConfig.kt
+++ b/src/main/kotlin/com/theapache64/gpm/utils/GpmConfig.kt
@@ -1,5 +1,5 @@
 package com.theapache64.gpm.utils
 
 object GpmConfig {
-    const val IS_DEBUG_MODE = true
+    // const val IS_DEBUG_MODE = true
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index 506056f..80dd80b 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -13,10 +13,12 @@ import com.theapache64.gpm.di.components.DaggerInstallComponent
 import com.theapache64.gpm.di.components.InstallComponent
 import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.di.modules.NetworkModule
+import com.theapache64.gpm.di.modules.TransactionModule
 import com.theapache64.gpm.runBlockingUnitTest
 import com.winterbe.expekt.should
 import it.cosenonjaviste.daggermock.DaggerMock
 import it.cosenonjaviste.daggermock.InjectFromComponent
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -36,12 +38,13 @@ class InstallTest {
 
     private lateinit var installCmd: CommandLine
 
-    private val install = Install()
+    private val install = Install(true)
 
     @get:Rule
     val daggerRule = DaggerMock.rule<InstallComponent>(NetworkModule()) {
         customizeBuilder<DaggerInstallComponent.Builder> {
-            it.gradleModule(GradleModule(true))
+            it.gradleModule(GradleModule(isFromTest = true, isDeleteTempFile = true))
+                .transactionModule(TransactionModule(true))
         }
         set {
             it.inject(install)
@@ -94,8 +97,6 @@ class InstallTest {
 
         this.installCmd = CommandLine(install)
         installCmd.out = PrintWriter(StringWriter())
-
-        tempBuildGradle.delete()
     }
 
     @Test
@@ -139,4 +140,9 @@ class InstallTest {
         exitCode.should.equal(InstallViewModel.RESULT_REPO_NOT_FOUND)
     }
 
+    @After
+    fun tearDown() {
+        tempBuildGradle.delete()
+    }
+
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
index 1ab3579..ea29b14 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
@@ -14,7 +14,6 @@ class UninstallTest {
     private lateinit var cmd: CommandLine
 
 
-
     @Before
     fun setUp() {
         this.cmd = CommandLine(Gpm()).apply {
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
index 362a169..abbc7af 100644
--- a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
@@ -8,5 +8,5 @@ import it.cosenonjaviste.daggermock.DaggerMockRule
 class MyDaggerMockRule : DaggerMockRule<InstallComponent>(
     InstallComponent::class.java,
     NetworkModule(),
-    GradleModule(true)
+    GradleModule(isFromTest = true, isDeleteTempFile = true)
 )
\ No newline at end of file

From f93351c292e293eb2f3681b760c2a1a3212e2bfa Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Wed, 6 May 2020 09:35:32 +0530
Subject: [PATCH 20/24] =?UTF-8?q?=F0=9F=90=9B=20fix=20@named=20provide=20i?=
 =?UTF-8?q?ssue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theapache64/gpm/core/TransactionManager.kt | 18 +++++-------------
 .../gpm/di/components/InstallComponent.kt      |  7 +++++++
 .../theapache64/gpm/di/modules/GradleModule.kt |  7 ++++++-
 .../gpm/di/modules/TransactionModule.kt        | 17 +++++++++++++++--
 .../gpm/commands/subcommands/InstallTest.kt    | 10 ++++++++--
 5 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
index bc72d9d..652c613 100644
--- a/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
+++ b/src/main/kotlin/com/theapache64/gpm/core/TransactionManager.kt
@@ -11,7 +11,7 @@ import java.io.IOException
 import javax.inject.Inject
 
 class TransactionManager @Inject constructor(
-    private val isFromTest: Boolean,
+    private val gpmJsonFile: File,
     private val moshi: Moshi
 ) {
 
@@ -19,14 +19,6 @@ class TransactionManager @Inject constructor(
         moshi.adapter(GpmFileData::class.java).indent(" ")
     }
 
-    private val gpmFile by lazy {
-        @Suppress("ConstantConditionIf")
-        if (isFromTest) {
-            File("src/test/resources/temp.gpm.json")
-        } else {
-            File("gpm.json")
-        }
-    }
 
     fun add(installedName: String, type: GradleDep.Type, newGpmDep: GpmDep) {
 
@@ -46,10 +38,10 @@ class TransactionManager @Inject constructor(
             installedName,
             newGpmDep
         )
-        val newFileData = if (!gpmFile.exists()) {
+        val newFileData = if (!gpmJsonFile.exists()) {
             GpmFileData(mutableListOf(depToStore))
         } else {
-            val gpmFileData = adapter.fromJson(gpmFile.readText())
+            val gpmFileData = adapter.fromJson(gpmJsonFile.readText())
             gpmFileData!!.deps.add(depToStore)
             gpmFileData
         }
@@ -77,7 +69,7 @@ class TransactionManager @Inject constructor(
 
     private fun setData(newFileData: GpmFileData) {
         val gpmFileDataJson = adapter.toJson(newFileData)
-        gpmFile.writeText(gpmFileDataJson)
+        gpmJsonFile.writeText(gpmFileDataJson)
     }
 
     fun getInstalled(type: String, depName: String): List<GpmFileData.AddedDep> {
@@ -105,7 +97,7 @@ class TransactionManager @Inject constructor(
     }
 
     private fun getData() = try {
-        adapter.fromJson(gpmFile.readText())
+        adapter.fromJson(gpmJsonFile.readText())
     } catch (e: FileNotFoundException) {
         null
     }
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 5d33326..7bc9e35 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -10,6 +10,7 @@ import com.theapache64.gpm.data.repos.MavenRepo
 import com.theapache64.gpm.di.modules.*
 import dagger.Component
 import java.io.File
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Singleton
@@ -21,7 +22,13 @@ interface InstallComponent {
     fun getGpm(): Gpm
     fun gpmApiInterface(): GpmApiInterface
     fun mavenApiInterface(): MavenApiInterface
+
+    @Named("gradle_file")
     fun gradleFile(): File
+
+    @Named("gpm_json_file")
+    fun gpmJsonFile(): File
+
     fun mavenRepo(): MavenRepo
     fun gpmFileManager(): TransactionManager
 
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index e15bb3a..2be2a3b 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -5,6 +5,7 @@ import com.theapache64.gpm.core.gm.GradleManager
 import dagger.Module
 import dagger.Provides
 import java.io.File
+import javax.inject.Named
 
 @Module(includes = [TransactionModule::class])
 class GradleModule(
@@ -13,6 +14,7 @@ class GradleModule(
 ) {
 
     @Provides
+    @Named("gradle_file")
     fun gradleFile(): File {
 
         @Suppress("ConstantConditionIf")
@@ -52,7 +54,10 @@ class GradleModule(
 
 
     @Provides
-    fun provideGradleManager(gradleFile: File, transactionManager: TransactionManager): GradleManager {
+    fun provideGradleManager(
+        @Named("gradle_file") gradleFile: File,
+        transactionManager: TransactionManager
+    ): GradleManager {
         return GradleManager(transactionManager, gradleFile)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
index 6ee7c0f..e2fd01e 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
@@ -4,11 +4,24 @@ import com.squareup.moshi.Moshi
 import com.theapache64.gpm.core.TransactionManager
 import dagger.Module
 import dagger.Provides
+import java.io.File
+import javax.inject.Named
 
 @Module(includes = [MoshiModule::class])
 class TransactionModule(private val isFromTest: Boolean) {
+
+    @Provides
+    @Named("gpm_json_file")
+    fun provideGpmJsonFile(): File {
+        return if (isFromTest) {
+            File("src/test/resources/temp.gpm.json")
+        } else {
+            File("gpm.json")
+        }
+    }
+
     @Provides
-    fun provideTransactionManager(moshi: Moshi): TransactionManager {
-        return TransactionManager(isFromTest, moshi)
+    fun provideTransactionManager(@Named("gpm_json_file") gpmJsonFile: File, moshi: Moshi): TransactionManager {
+        return TransactionManager(gpmJsonFile, moshi)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index 80dd80b..cce39b6 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -27,6 +27,7 @@ import retrofit2.HttpException
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
+import javax.inject.Named
 
 class InstallTest {
 
@@ -40,6 +41,10 @@ class InstallTest {
 
     private val install = Install(true)
 
+
+    private lateinit var tempBuildGradle: File
+    private lateinit var tempGpmJson: File
+
     @get:Rule
     val daggerRule = DaggerMock.rule<InstallComponent>(NetworkModule()) {
         customizeBuilder<DaggerInstallComponent.Builder> {
@@ -47,12 +52,12 @@ class InstallTest {
                 .transactionModule(TransactionModule(true))
         }
         set {
+            tempBuildGradle = it.gradleFile()
+            tempGpmJson = it.gpmJsonFile()
             it.inject(install)
         }
     }
 
-    @InjectFromComponent
-    lateinit var tempBuildGradle: File
 
     private var fakeGpmApi: GpmApiInterface = mock()
     private var fakeMavenApi: MavenApiInterface = mock()
@@ -143,6 +148,7 @@ class InstallTest {
     @After
     fun tearDown() {
         tempBuildGradle.delete()
+        tempGpmJson.delete()
     }
 
 }
\ No newline at end of file

From 89b7829784608142007f0831227105f7940bf31a Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Wed, 6 May 2020 09:50:37 +0530
Subject: [PATCH 21/24] =?UTF-8?q?=F0=9F=93=88=20fix=20controlled=20temp=20?=
 =?UTF-8?q?file=20delete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gpm/commands/subcommands/install/Install.kt |  2 +-
 .../commands/subcommands/uninstall/Uninstall.kt |  2 +-
 .../gpm/di/components/InstallComponent.kt       | 10 +++++++++-
 .../theapache64/gpm/di/modules/GradleModule.kt  | 14 ++++----------
 .../gpm/commands/subcommands/InstallTest.kt     |  2 +-
 .../subcommands/uninstall/UninstallTest.kt      | 17 ++++++++++++-----
 .../theapache64/gpm/rules/MyDaggerMockRule.kt   |  2 +-
 7 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
index fe4c4b5..a603a22 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/install/Install.kt
@@ -47,7 +47,7 @@ class Install(isFromTest: Boolean) : BaseCommand<Int>(isFromTest) {
     init {
         DaggerInstallComponent
             .builder()
-            .gradleModule(GradleModule(isFromTest = false, isDeleteTempFile = true))
+            .gradleModule(GradleModule(isFromTest = false))
             .transactionModule(TransactionModule(false))
             .build()
             .inject(this)
diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
index 9a841bf..752d665 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
@@ -42,7 +42,7 @@ class Uninstall(isFromTest: Boolean) : BaseCommand<Int>(isFromTest) {
     init {
         DaggerUninstallComponent
             .builder()
-            .gradleModule(GradleModule(isFromTest = false, isDeleteTempFile = false))
+            .gradleModule(GradleModule(isFromTest = false))
             .build()
             .inject(this)
     }
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 7bc9e35..8927c5f 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -14,7 +14,15 @@ import javax.inject.Named
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [ViewModelModule::class, NetworkModule::class, MoshiModule::class, GradleModule::class, CommandModule::class])
+@Component(
+    modules = [
+        ViewModelModule::class,
+        NetworkModule::class,
+        MoshiModule::class,
+        GradleModule::class,
+        CommandModule::class
+    ]
+)
 interface InstallComponent {
     /*
      * For testing
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index 2be2a3b..f912a07 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -9,8 +9,7 @@ import javax.inject.Named
 
 @Module(includes = [TransactionModule::class])
 class GradleModule(
-    private val isFromTest: Boolean,
-    private val isDeleteTempFile: Boolean
+    private val isFromTest: Boolean
 ) {
 
     @Provides
@@ -19,15 +18,10 @@ class GradleModule(
 
         @Suppress("ConstantConditionIf")
         return if (isFromTest) {
-
             val tempGradleFile = File("src/test/resources/temp.build.gradle")
-
-            if (!tempGradleFile.exists() || isDeleteTempFile) {
-                val sampleFile = File("src/test/resources/sample.build.gradle")
-                tempGradleFile.delete()
-                sampleFile.copyTo(tempGradleFile)
-            }
-
+            val sampleFile = File("src/test/resources/sample.build.gradle")
+            tempGradleFile.delete()
+            sampleFile.copyTo(tempGradleFile)
             tempGradleFile
 
         } else {
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index cce39b6..f84eabd 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -48,7 +48,7 @@ class InstallTest {
     @get:Rule
     val daggerRule = DaggerMock.rule<InstallComponent>(NetworkModule()) {
         customizeBuilder<DaggerInstallComponent.Builder> {
-            it.gradleModule(GradleModule(isFromTest = true, isDeleteTempFile = true))
+            it.gradleModule(GradleModule(isFromTest = true))
                 .transactionModule(TransactionModule(true))
         }
         set {
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
index ea29b14..2793dcf 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
@@ -2,8 +2,13 @@ package com.theapache64.gpm.commands.subcommands.uninstall
 
 import com.theapache64.gpm.commands.Gpm
 import com.theapache64.gpm.commands.subcommands.install.InstallViewModel
+import com.theapache64.gpm.di.components.DaggerUninstallComponent
+import com.theapache64.gpm.di.components.UninstallComponent
+import com.theapache64.gpm.di.modules.GradleModule
 import com.winterbe.expekt.should
+import it.cosenonjaviste.daggermock.DaggerMock
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import picocli.CommandLine
 import java.io.PrintWriter
@@ -13,6 +18,12 @@ class UninstallTest {
 
     private lateinit var cmd: CommandLine
 
+    @get:Rule
+    val daggerMock = DaggerMock.rule<UninstallComponent>() {
+        customizeBuilder<DaggerUninstallComponent.Builder> {
+            it.gradleModule(GradleModule(true))
+        }
+    }
 
     @Before
     fun setUp() {
@@ -23,10 +34,8 @@ class UninstallTest {
 
     @Test
     fun `Uninstall installed dependency`() {
+        // Mocking installed dependency
 
-        // Install dependency
-        val installExitCode = cmd.execute("install", "okhttp")
-        installExitCode.should.equal(InstallViewModel.RESULT_DEP_INSTALLED)
 
         // Uninstall dep
         val uninstallExitCode = cmd.execute("uninstall", "okhttp")
@@ -48,8 +57,6 @@ class UninstallTest {
 
     @Test
     fun `Uninstall dependency which installed through same dependency name`() {
-
-
         val uninstallExitCode = cmd.execute("uninstall", "same-name")
         uninstallExitCode.should.equal(UninstallViewModel.RESULT_DEP_UNINSTALLED)
     }
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
index abbc7af..3746162 100644
--- a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
@@ -8,5 +8,5 @@ import it.cosenonjaviste.daggermock.DaggerMockRule
 class MyDaggerMockRule : DaggerMockRule<InstallComponent>(
     InstallComponent::class.java,
     NetworkModule(),
-    GradleModule(isFromTest = true, isDeleteTempFile = true)
+    GradleModule(isFromTest = true)
 )
\ No newline at end of file

From 9baa29511735ee4315b7714052da5f1349eee642 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Thu, 7 May 2020 06:07:16 +0530
Subject: [PATCH 22/24] =?UTF-8?q?=F0=9F=92=9A=20uninstall=20test=20fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subcommands/uninstall/Uninstall.kt        |   2 +
 .../gpm/di/components/UninstallComponent.kt   |  17 ++-
 .../subcommands/uninstall/UninstallTest.kt    | 136 ++++++++++++++++--
 src/test/resources/sample.build.gradle        |   3 -
 4 files changed, 139 insertions(+), 19 deletions(-)

diff --git a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
index 752d665..827daaa 100644
--- a/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
+++ b/src/main/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/Uninstall.kt
@@ -4,6 +4,7 @@ import com.theapache64.gpm.commands.base.BaseCommand
 import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.di.components.DaggerUninstallComponent
 import com.theapache64.gpm.di.modules.GradleModule
+import com.theapache64.gpm.di.modules.TransactionModule
 import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import javax.inject.Inject
@@ -43,6 +44,7 @@ class Uninstall(isFromTest: Boolean) : BaseCommand<Int>(isFromTest) {
         DaggerUninstallComponent
             .builder()
             .gradleModule(GradleModule(isFromTest = false))
+            .transactionModule(TransactionModule(isFromTest = false))
             .build()
             .inject(this)
     }
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
index 29198d5..1d563ac 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
@@ -1,14 +1,29 @@
 package com.theapache64.gpm.di.components
 
 import com.theapache64.gpm.commands.subcommands.uninstall.Uninstall
+import com.theapache64.gpm.core.TransactionManager
+import com.theapache64.gpm.core.gm.GradleManager
+import com.theapache64.gpm.di.modules.GradleModule
+import com.theapache64.gpm.di.modules.TransactionModule
 import com.theapache64.gpm.di.modules.ViewModelModule
 import dagger.Component
+import java.io.File
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Singleton
 @Component(
-    modules = [ViewModelModule::class]
+    modules = [ViewModelModule::class, GradleModule::class, TransactionModule::class]
 )
 interface UninstallComponent {
     fun inject(uninstall: Uninstall)
+
+    @Named("gradle_file")
+    fun gradleFile(): File
+
+    @Named("gpm_json_file")
+    fun gpmJsonFile(): File
+    fun transactionManager(): TransactionManager
+    fun gradleManager(): GradleManager
+
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
index 2793dcf..6ef5ce3 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/uninstall/UninstallTest.kt
@@ -1,78 +1,184 @@
 package com.theapache64.gpm.commands.subcommands.uninstall
 
-import com.theapache64.gpm.commands.Gpm
-import com.theapache64.gpm.commands.subcommands.install.InstallViewModel
+import com.theapache64.gpm.core.gm.GradleDep
+import com.theapache64.gpm.core.gm.GradleManager
+import com.theapache64.gpm.data.remote.gpm.models.GpmDep
 import com.theapache64.gpm.di.components.DaggerUninstallComponent
 import com.theapache64.gpm.di.components.UninstallComponent
 import com.theapache64.gpm.di.modules.GradleModule
+import com.theapache64.gpm.di.modules.TransactionModule
 import com.winterbe.expekt.should
 import it.cosenonjaviste.daggermock.DaggerMock
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import picocli.CommandLine
+import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
 
 class UninstallTest {
 
-    private lateinit var cmd: CommandLine
+    private lateinit var gm: GradleManager
+    private lateinit var gpmJsonFile: File
+    private lateinit var tempBuildGradle: File
+    private lateinit var uninstallCmd: CommandLine
+    private val uninstall = Uninstall(true)
 
     @get:Rule
     val daggerMock = DaggerMock.rule<UninstallComponent>() {
         customizeBuilder<DaggerUninstallComponent.Builder> {
             it.gradleModule(GradleModule(true))
+                .transactionModule(TransactionModule(true))
+        }
+        set {
+            tempBuildGradle = it.gradleFile()
+            gpmJsonFile = it.gpmJsonFile()
+            gm = it.gradleManager()
+            it.inject(uninstall)
         }
     }
 
+
     @Before
     fun setUp() {
-        this.cmd = CommandLine(Gpm()).apply {
+        this.uninstallCmd = CommandLine(uninstall).apply {
             out = PrintWriter(StringWriter())
         }
     }
 
+    @After
+    fun tearDown() {
+        tempBuildGradle.delete()
+        gpmJsonFile.delete()
+    }
+
     @Test
     fun `Uninstall installed dependency`() {
-        // Mocking installed dependency
+
+        // Adding manual dependency
+        gm.addDep(
+            "materialcolors",
+            GradleDep.Type.IMP,
+            GpmDep(
+                "materialcolors",
+                GradleDep.Type.IMP.key,
+                "https://materialcolors.github.io/materialcolors/",
+                "jcenter",
+                "https://github.com/square/materialcolors/",
+                "com.theah64.materialcolors",
+                "Material Colors",
+                "A material color library",
+                "1.0.0"
+            )
+        )
 
 
         // Uninstall dep
-        val uninstallExitCode = cmd.execute("uninstall", "okhttp")
+        val uninstallExitCode = uninstallCmd.execute("materialcolors")
         uninstallExitCode.should.equal(UninstallViewModel.RESULT_DEP_UNINSTALLED)
     }
 
     @Test
     fun `Uninstall dependency which is manually added`() {
         // Uninstall dep
-        val uninstallExitCode = cmd.execute("uninstall", "robolectric")
+        val uninstallExitCode = uninstallCmd.execute("robolectric")
         uninstallExitCode.should.equal(UninstallViewModel.RESULT_NO_DEP_INSTALLED)
     }
 
     @Test
     fun `Uninstall not installed dependency`() {
-        val uninstallExitCode = cmd.execute("uninstall", "invalid-library")
+        val uninstallExitCode = uninstallCmd.execute("invalid-library")
         uninstallExitCode.should.equal(UninstallViewModel.RESULT_NO_DEP_INSTALLED)
     }
 
     @Test
     fun `Uninstall dependency which installed through same dependency name`() {
-        val uninstallExitCode = cmd.execute("uninstall", "same-name")
+
+        gm.addDep(
+            "same-name",
+            GradleDep.Type.IMP,
+            GpmDep(
+                "same-name-1",
+                GradleDep.Type.IMP.key,
+                "",
+                "",
+                "",
+                "com.theah64.same-name",
+                "Same Name 1",
+                "Same Name 1",
+                "1.0.0"
+            )
+        )
+
+        gm.addDep(
+            "same-name",
+            GradleDep.Type.IMP,
+            GpmDep(
+                "same-name-2",
+                GradleDep.Type.IMP.key,
+                "",
+                "",
+                "",
+                "com.theah64.same-name",
+                "Same Name 2",
+                "Same Name 2",
+                "1.0.0"
+            )
+        )
+
+
+        val uninstallExitCode = uninstallCmd.execute("same-name")
         uninstallExitCode.should.equal(UninstallViewModel.RESULT_DEP_UNINSTALLED)
     }
 
     @Test
     fun `Uninstall testImplementation`() {
 
+        val libName = "some-testing-library"
+        gm.addDep(
+            libName,
+            GradleDep.Type.TEST_IMP,
+            GpmDep(
+                libName,
+                GradleDep.Type.TEST_IMP.key,
+                "",
+                "",
+                "",
+                "com.theah64.some-testing-library",
+                "Some Testing Library",
+                "Some testing lib for JVM",
+                "1.0.0"
+            )
+        )
+
+
+        val uninstallExitCode = uninstallCmd.execute("--save-dev", libName)
+        uninstallExitCode.should.equal(UninstallViewModel.RESULT_DEP_UNINSTALLED)
     }
 
     @Test
     fun `Uninstall androidTestImplementation`() {
-
-    }
-
-    @Test
-    fun `Uninstall modified dependency`() {
-
+        val libName = "some-testing-library"
+        gm.addDep(
+            libName,
+            GradleDep.Type.AND_TEST_IMP,
+            GpmDep(
+                libName,
+                GradleDep.Type.AND_TEST_IMP.key,
+                "",
+                "",
+                "",
+                "com.theah64.some-testing-library",
+                "Some Testing Library",
+                "Some testing lib for Android",
+                "1.0.0"
+            )
+        )
+
+
+        val uninstallExitCode = uninstallCmd.execute("--save-dev-android", libName)
+        uninstallExitCode.should.equal(UninstallViewModel.RESULT_DEP_UNINSTALLED)
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/sample.build.gradle b/src/test/resources/sample.build.gradle
index 1441071..7efb625 100644
--- a/src/test/resources/sample.build.gradle
+++ b/src/test/resources/sample.build.gradle
@@ -125,9 +125,6 @@ dependencies {
     testImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
 
-    implementation 'com.squareup.okhttp3:same-name:1.1.1'
-    implementation 'com.squareup.okhttp3:another:1.1.1'
-
     // Espresso
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
     androidTestImplementation('com.schibsted.spain:barista:3.4.0') {

From 3bbedcd3238ebb49ab1e9a702ae10704374ec53b Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Thu, 7 May 2020 07:40:58 +0530
Subject: [PATCH 23/24] =?UTF-8?q?=F0=9F=92=9A=20fix=20test=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/theapache64/gpm/di/Qualifiers.kt      | 13 ++++++++++
 .../gpm/di/components/InstallComponent.kt     |  7 +++---
 .../gpm/di/components/UninstallComponent.kt   |  7 +++---
 .../gpm/di/modules/GradleModule.kt            |  7 +++---
 .../gpm/di/modules/TransactionModule.kt       |  7 +++---
 .../gpm/commands/subcommands/InstallTest.kt   |  3 ++-
 .../theapache64/gpm/rules/MyDaggerMockRule.kt | 10 +++++++-
 .../gpm/utils/GradleManagerTest.kt            | 24 +++++++++++++------
 .../theapache64/gpm/utils/StringUtilsTest.kt  |  2 +-
 9 files changed, 58 insertions(+), 22 deletions(-)
 create mode 100644 src/main/kotlin/com/theapache64/gpm/di/Qualifiers.kt

diff --git a/src/main/kotlin/com/theapache64/gpm/di/Qualifiers.kt b/src/main/kotlin/com/theapache64/gpm/di/Qualifiers.kt
new file mode 100644
index 0000000..89c81b8
--- /dev/null
+++ b/src/main/kotlin/com/theapache64/gpm/di/Qualifiers.kt
@@ -0,0 +1,13 @@
+package com.theapache64.gpm.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+annotation class GradleFile
+
+@Qualifier
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+annotation class GpmJsonFile
\ No newline at end of file
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
index 8927c5f..871040b 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/InstallComponent.kt
@@ -7,10 +7,11 @@ import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.data.remote.gpm.GpmApiInterface
 import com.theapache64.gpm.data.remote.maven.MavenApiInterface
 import com.theapache64.gpm.data.repos.MavenRepo
+import com.theapache64.gpm.di.GpmJsonFile
+import com.theapache64.gpm.di.GradleFile
 import com.theapache64.gpm.di.modules.*
 import dagger.Component
 import java.io.File
-import javax.inject.Named
 import javax.inject.Singleton
 
 @Singleton
@@ -31,10 +32,10 @@ interface InstallComponent {
     fun gpmApiInterface(): GpmApiInterface
     fun mavenApiInterface(): MavenApiInterface
 
-    @Named("gradle_file")
+    @GradleFile
     fun gradleFile(): File
 
-    @Named("gpm_json_file")
+    @GpmJsonFile
     fun gpmJsonFile(): File
 
     fun mavenRepo(): MavenRepo
diff --git a/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt b/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
index 1d563ac..9e0b670 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/components/UninstallComponent.kt
@@ -8,7 +8,8 @@ import com.theapache64.gpm.di.modules.TransactionModule
 import com.theapache64.gpm.di.modules.ViewModelModule
 import dagger.Component
 import java.io.File
-import javax.inject.Named
+import com.theapache64.gpm.di.GpmJsonFile
+import com.theapache64.gpm.di.GradleFile
 import javax.inject.Singleton
 
 @Singleton
@@ -18,10 +19,10 @@ import javax.inject.Singleton
 interface UninstallComponent {
     fun inject(uninstall: Uninstall)
 
-    @Named("gradle_file")
+    @GradleFile
     fun gradleFile(): File
 
-    @Named("gpm_json_file")
+    @GpmJsonFile
     fun gpmJsonFile(): File
     fun transactionManager(): TransactionManager
     fun gradleManager(): GradleManager
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
index f912a07..55477a0 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/GradleModule.kt
@@ -5,7 +5,8 @@ import com.theapache64.gpm.core.gm.GradleManager
 import dagger.Module
 import dagger.Provides
 import java.io.File
-import javax.inject.Named
+import com.theapache64.gpm.di.GpmJsonFile
+import com.theapache64.gpm.di.GradleFile
 
 @Module(includes = [TransactionModule::class])
 class GradleModule(
@@ -13,7 +14,7 @@ class GradleModule(
 ) {
 
     @Provides
-    @Named("gradle_file")
+    @GradleFile
     fun gradleFile(): File {
 
         @Suppress("ConstantConditionIf")
@@ -49,7 +50,7 @@ class GradleModule(
 
     @Provides
     fun provideGradleManager(
-        @Named("gradle_file") gradleFile: File,
+        @GradleFile gradleFile: File,
         transactionManager: TransactionManager
     ): GradleManager {
         return GradleManager(transactionManager, gradleFile)
diff --git a/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt b/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
index e2fd01e..a687fdd 100644
--- a/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
+++ b/src/main/kotlin/com/theapache64/gpm/di/modules/TransactionModule.kt
@@ -5,13 +5,14 @@ import com.theapache64.gpm.core.TransactionManager
 import dagger.Module
 import dagger.Provides
 import java.io.File
-import javax.inject.Named
+import com.theapache64.gpm.di.GpmJsonFile
+import com.theapache64.gpm.di.GradleFile
 
 @Module(includes = [MoshiModule::class])
 class TransactionModule(private val isFromTest: Boolean) {
 
     @Provides
-    @Named("gpm_json_file")
+    @GpmJsonFile
     fun provideGpmJsonFile(): File {
         return if (isFromTest) {
             File("src/test/resources/temp.gpm.json")
@@ -21,7 +22,7 @@ class TransactionModule(private val isFromTest: Boolean) {
     }
 
     @Provides
-    fun provideTransactionManager(@Named("gpm_json_file") gpmJsonFile: File, moshi: Moshi): TransactionManager {
+    fun provideTransactionManager(@GpmJsonFile gpmJsonFile: File, moshi: Moshi): TransactionManager {
         return TransactionManager(gpmJsonFile, moshi)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
index f84eabd..1b428f0 100644
--- a/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/commands/subcommands/InstallTest.kt
@@ -27,7 +27,8 @@ import retrofit2.HttpException
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
-import javax.inject.Named
+import com.theapache64.gpm.di.GpmJsonFile
+import com.theapache64.gpm.di.GradleFile
 
 class InstallTest {
 
diff --git a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
index 3746162..c0b8bf5 100644
--- a/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
+++ b/src/test/kotlin/com/theapache64/gpm/rules/MyDaggerMockRule.kt
@@ -1,12 +1,20 @@
 package com.theapache64.gpm.rules
 
+import com.theapache64.gpm.di.components.DaggerInstallComponent
 import com.theapache64.gpm.di.components.InstallComponent
 import com.theapache64.gpm.di.modules.GradleModule
 import com.theapache64.gpm.di.modules.NetworkModule
+import com.theapache64.gpm.di.modules.TransactionModule
 import it.cosenonjaviste.daggermock.DaggerMockRule
 
 class MyDaggerMockRule : DaggerMockRule<InstallComponent>(
     InstallComponent::class.java,
     NetworkModule(),
     GradleModule(isFromTest = true)
-)
\ No newline at end of file
+) {
+    init {
+        customizeBuilder<DaggerInstallComponent.Builder> {
+            it.transactionModule(TransactionModule(true))
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
index 40618fd..c647576 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/GradleManagerTest.kt
@@ -4,8 +4,12 @@ import com.theapache64.gpm.core.TransactionManager
 import com.theapache64.gpm.core.gm.GradleDep
 import com.theapache64.gpm.core.gm.GradleManager
 import com.theapache64.gpm.data.remote.gpm.models.GpmDep
-import com.theapache64.gpm.rules.MyDaggerMockRule
+import com.theapache64.gpm.di.GradleFile
+import com.theapache64.gpm.di.components.InstallComponent
+import com.theapache64.gpm.di.modules.GradleModule
+import com.theapache64.gpm.di.modules.TransactionModule
 import com.winterbe.expekt.should
+import it.cosenonjaviste.daggermock.DaggerMock
 import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Before
 import org.junit.Rule
@@ -15,19 +19,25 @@ import java.io.File
 class GradleManagerTest {
 
     private lateinit var gradleManager: GradleManager
+    private lateinit var gradleFile: File
 
-    @get:Rule
-    val daggerRule = MyDaggerMockRule()
 
-    @InjectFromComponent
-    lateinit var sampleGradleFile: File
+    @get:Rule
+    val daggerRule = DaggerMock.rule<InstallComponent>(
+        GradleModule(true),
+        TransactionModule(true)
+    ) {
+        set {
+            gradleFile = it.gradleFile()
+        }
+    }
 
     @InjectFromComponent
-    lateinit var transactionManager: TransactionManager
+    lateinit var tm: TransactionManager
 
     @Before
     fun setUp() {
-        this.gradleManager = GradleManager(transactionManager, sampleGradleFile)
+        this.gradleManager = GradleManager(tm, gradleFile)
     }
 
     @Test
diff --git a/src/test/kotlin/com/theapache64/gpm/utils/StringUtilsTest.kt b/src/test/kotlin/com/theapache64/gpm/utils/StringUtilsTest.kt
index d718eb6..fc19785 100644
--- a/src/test/kotlin/com/theapache64/gpm/utils/StringUtilsTest.kt
+++ b/src/test/kotlin/com/theapache64/gpm/utils/StringUtilsTest.kt
@@ -17,6 +17,6 @@ class StringUtilsTest {
 
         // open = 13, close = 29
         val endingIndex = StringUtils.getClosingIndexOf(input, '{', 13, '}')
-        endingIndex.should.equal(2)
+        endingIndex.should.equal(29)
     }
 }
\ No newline at end of file

From 3e08611f6763f0a1b2041ed9961d6debe22ac4e0 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Thu, 7 May 2020 08:15:51 +0530
Subject: [PATCH 24/24] =?UTF-8?q?=F0=9F=8C=9F=20add=20uninstall?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 472b17b..cf8c149 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,10 @@
 | `install`                    | To install the dependency as `implementation`                | ✔️          | Done | v1.0.0-alpha01 |
 | `install --save-dev`         | To install the dependency as `testImplementation`            | ✔️           | Done | v1.0.0-alpha01 |
 | `install --save-dev-android` | To install the dependency as `androidTestImplementation`     | ✔️           | Done | v1.0.0-alpha01 |
-| `uninstall`                  | To uninstall the dependency from `implementation`            | ⏳           | Implementing | v1.0.0-alpha01 |
-| `uninstall dev`              | To uninstall the dependency from `testImplementation`        | ⏳           | Implementing | v1.0.0-alpha01 |
-| `uninstall dev-android`      | To uninstall the dependency from `androidTestImplementation` | ⏳           | Implementing | v1.0.0-alpha01 |
-| `docs`                       | To open the documentation in default browser                 | ❌           | Pending | v1.0.0-alpha01 |
+| `uninstall`                  | To uninstall the dependency from `implementation`            | ✔️          | Done | v1.0.0-alpha01 |
+| `uninstall dev`              | To uninstall the dependency from `testImplementation`        | ✔️          | Done | v1.0.0-alpha01 |
+| `uninstall dev-android`      | To uninstall the dependency from `androidTestImplementation` | ✔️          | Done | v1.0.0-alpha01 |
+| `docs`                       | To open the documentation in default browser                 | ⏳           | Implementing | v1.0.0-alpha01 |
 | `update`                     | To update the dependency version to latest                   | ❌           | Pending | -              |
 | `list`                       | To list all the dependencies                                 | ❌           | Pending | -              |