pr-changelog 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2677dc2514acf2421fb7ec4c1093b6bb1900d69b
-  data.tar.gz: 50de946df20dcd9dc4415bda378a62d8b9b838e9
+  metadata.gz: 9db33b58231b65ae761fc37f5afbcee7e5c29367
+  data.tar.gz: b6cbded739746c388064e2e7dd9d1a5090c98d8b
 SHA512:
-  metadata.gz: 8751d4b780ce3d21d832f5cd40420b718ec7db04a6fcb625d46a9ff882d835cdae8f5eecaee5653a5bbcfc55900567065f064d4b6683056e83bca2e5ed39ee87
-  data.tar.gz: 04009519d80a2f7bbecdc356409ec40eff1cdcbd8a734bcc76b14a23011ed393ec3d176343d7cbcceaff0c81d9f85df40c1e9b6fb8157276b4673519989e799e
+  metadata.gz: 32d4047f47bb24dc41db38525372d7ef72cf0c45beda40ba8379fbaf1762eef07de2d07f6daee2a907e433b17532fcaba1e09ccc1f8b8fa981dafdb36310ccd1
+  data.tar.gz: c6a764d4f21cd651df2f53aba2ab4c773e4e2e0078a3bf893cca13e86884ed682bd3700ca3c7a6aad5e71d7b61f66af10e20778b883053799a63475616d001b8

data/bin/chlog

@@ -14,18 +14,17 @@ command :show do |c|
   c.example 'description', 'command example'
   c.option '--some-switch', 'Some switch that does something'
   c.action do |args, options|
-	if !ChangelogUtils.isXcodeDirectory
-		puts "changelog should be used in a xcode directory"
-	else
-		currentVersion = ChangelogUtils.showVersion
-		puts currentVersion
-		puts "=============="
 
-		while (ChangelogUtils.showVersion == currentVersion)
-			ChangelogUtils.goBack
-			if (ChangelogUtils.isPullRequestMerge)
-				 puts ChangelogUtils.printCurrentChange
-			end
+  	ChangelogUtils.validateCurrentDirectory
+
+	currentVersion = ChangelogUtils.showVersion
+	puts currentVersion
+	puts "=============="
+
+	while (ChangelogUtils.showVersion == currentVersion)
+		ChangelogUtils.goBack
+		if (ChangelogUtils.isPullRequestMerge)
+			 puts ChangelogUtils.printCurrentChange
 		end
 	end
 

data/lib/pr_changelog_utils.rb

@@ -13,10 +13,6 @@ class ChangelogUtils
 		end
 	end
   
-	def self.isXcodeDirectory  
-		projectName = ChangelogUtils.getProjectName
-		return projectName != nil
-	end
 
 	def self.plistFile
 		projectName = ChangelogUtils.getProjectName
@@ -61,4 +57,32 @@ class ChangelogUtils
 		branch = `git branch --no-color 2> /dev/null`.strip.scan(/\*\s(.*)/)
 		return branch[0][0] if branch.size()>0 and branch[0].size()>0
 	end 
+
+	def self.isXcodeDirectory  
+		projectName = ChangelogUtils.getProjectName
+		if projectName == nil
+			puts "changelog should be used in a xcode directory" 
+			exit
+		end
+	end
+
+	def self.validateNoChangeInCurrentWorkspace
+		if `git status -s`.strip != ""
+			puts "you have changes in your repository. Commit or discard changes before using changelog"
+			exit
+		end
+	end
+
+	def self.validateGitExists
+		if Dir[".git"].first == nil
+			puts "no git project found. changelog should be used in a git project."
+			exit
+		end
+	end
+
+	def self.validateCurrentDirectory
+		ChangelogUtils.validateGitExists
+		ChangelogUtils.validateNoChangeInCurrentWorkspace
+		ChangelogUtils.isXcodeDirectory
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pr-changelog
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - David Cortés
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.5
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: With this gem you can generate a changelog using Pull Requests logs on
   your local branch
 email: david@lafosca.cat