Rename packageKeywords to keywords

nirum-lang · Sep 23, 2017 · bbf9677 · bbf9677
1 parent 9009ab3
commit bbf9677
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/Nirum/Package/Metadata.hs b/src/Nirum/Package/Metadata.hs
@@ -7,7 +7,7 @@ module Nirum.Package.Metadata ( Author (Author, email, name, uri)
                                          , version
                                          , description
                                          , license
-                                         , packageKeywords
+                                         , keywords
                                          )
                               , MetadataError ( FieldError
                                               , FieldTypeError
@@ -104,7 +104,7 @@ data Metadata t =
     Metadata { version :: SV.Version
              , description :: Maybe Text
              , license :: Maybe Text
-             , packageKeywords :: Maybe Text
+             , keywords :: Maybe Text
              , authors :: [Author]
              , target :: (Eq t, Ord t, Show t, Target t) => t
              }
@@ -201,7 +201,7 @@ parseMetadata metadataPath' tomlText = do
     return Metadata { version = version'
                     , description = description'
                     , license = license'
-                    , packageKeywords = keywords'
+                    , keywords = keywords'
                     , authors = authors'
                     , target = target'
                     }

diff --git a/src/Nirum/Targets/Python.hs b/src/Nirum/Targets/Python.hs
@@ -123,7 +123,6 @@ import Nirum.Package.Metadata ( Author (Author, name, email)
                                          , version
                                          , description
                                          , license
-                                         , packageKeywords
                                          )
                               , MetadataError ( FieldError
                                               , FieldTypeError
@@ -144,6 +143,7 @@ import Nirum.Package.Metadata ( Author (Author, name, email)
                               , versionField
                               )
 import qualified Nirum.Package.ModuleSet as MS
+import qualified Nirum.Package.Metadata as MD
 
 minimumRuntime :: SV.Version
 minimumRuntime = SV.version 0 6 0 [] []
@@ -1225,7 +1225,7 @@ setup(
     pLicense :: Code
     pLicense = fromMaybeToMeta $ license metadata'
     pKeywords :: Code
-    pKeywords = fromMaybeToMeta $ packageKeywords metadata'
+    pKeywords = fromMaybeToMeta $ MD.keywords metadata'
     strings :: [Code] -> Code
     strings values = T.intercalate ", " $ map stringLiteral (L.sort values)
     author :: Code

diff --git a/test/Nirum/CodeBuilderSpec.hs b/test/Nirum/CodeBuilderSpec.hs
@@ -40,7 +40,7 @@ package = Package { metadata = Metadata { version = SV.version 0 0 1 [] []
                                         , authors = []
                                         , description = Nothing
                                         , license = Nothing
-                                        , packageKeywords = Nothing
+                                        , keywords = Nothing
                                         , target = DummyTarget
                                         }
                   , modules = modules'

diff --git a/test/Nirum/PackageSpec.hs b/test/Nirum/PackageSpec.hs
@@ -41,7 +41,7 @@ import Nirum.Package.Metadata ( Metadata ( Metadata
                                          , version
                                          , description
                                          , license
-                                         , packageKeywords
+                                         , keywords
                                          )
                               , MetadataError (FormatError)
                               , Target (targetName)
@@ -65,7 +65,7 @@ createValidPackage t = createPackage Metadata { version = SV.initial
                                               , authors = []
                                               , description = Nothing
                                               , license = Nothing
-                                              , packageKeywords = Nothing
+                                              , keywords = Nothing
                                               , target = t
                                               } validModules
 
@@ -115,7 +115,7 @@ testPackage target' = do
                                          , authors = []
                                          , description = Nothing
                                          , license = Nothing
-                                         , packageKeywords = Nothing
+                                         , keywords = Nothing
                                          , target = target'
                                          }
                 metadata package `shouldBe` metadata'

diff --git a/test/Nirum/Targets/PythonSpec.hs b/test/Nirum/Targets/PythonSpec.hs
@@ -43,7 +43,7 @@ import Nirum.Package.Metadata ( Author (Author, email, name, uri)
                                          , version
                                          , description
                                          , license
-                                         , packageKeywords
+                                         , keywords
                                          )
                               , Target (compilePackage)
                               )
@@ -104,7 +104,7 @@ makeDummySource' pathPrefix m renames =
               ]
         , description = Just "Package description"
         , license = Just "MIT"
-        , packageKeywords = Just "test example examples"
+        , keywords = Just "test example examples"
         , target = Python "sample-package" minimumRuntime renames
         }
     pkg :: Package Python